Linux 3.18.122
Greg KH
maintainerI'm announcing the release of the 3.18.122 kernel.
All users of the 3.18 kernel series must upgrade.
The updated 3.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/alpha/kernel/osf_sys.c | 64 ++++++++++------------ arch/arm/boot/dts/tegra30-cardhu.dtsi | 1 arch/powerpc/include/asm/fadump.h | 3 - arch/powerpc/kernel/fadump.c | 92 +++++++++++++++++++++++++++----- arch/powerpc/platforms/pseries/ras.c | 2 arch/sparc/kernel/sys_sparc_32.c | 22 ++++--- arch/sparc/kernel/sys_sparc_64.c | 20 ++++--- drivers/iio/frequency/ad9523.c | 4 - drivers/md/bcache/writeback.c | 4 + drivers/md/dm-cache-metadata.c | 3 - drivers/pwm/pwm-tiehrpwm.c | 2 drivers/spi/spi-davinci.c | 2 drivers/video/fbdev/core/fbmem.c | 38 +++++++++++-- fs/nfs/blocklayout/dev.c | 2 fs/ubifs/journal.c | 7 ++ fs/ubifs/lprops.c | 8 +- fs/xattr.c | 2 include/video/udlfb.h | 2 kernel/kthread.c | 8 ++ kernel/sys.c | 95 ++++++++++++++++------------------ kernel/trace/blktrace.c | 4 + kernel/trace/trace.c | 4 + kernel/trace/trace_uprobe.c | 2 kernel/user_namespace.c | 39 ++++++------- kernel/utsname_sysctl.c | 41 ++++++++------ mm/memory.c | 9 --- net/9p/client.c | 2 net/9p/trans_fd.c | 7 ++ net/9p/trans_rdma.c | 3 + net/9p/trans_virtio.c | 6 +- 31 files changed, 308 insertions(+), 192 deletions(-)
Al Viro (1):
osf_getdomainname(): use copy_to_user()
Bartosz Golaszewski (1):
spi: davinci: fix a NULL pointer dereference
Christian Brauner (1):
getxattr: use correct xattr length
Dan Carpenter (1):
pnfs/blocklayout: off by one in bl_map_stripe()
Eric W. Biederman (1):
userns; Correct the comment in map_write
Greg Kroah-Hartman (1):
Linux 3.18.122
Hari Bathini (1):
powerpc/fadump: handle crash memory ranges array index overflow
Jann Horn (2):
sys: don't hold uts_sem while accessing userspace memory
userns: move user access out of the mutex
Jon Hunter (1):
ARM: tegra: Fix Tegra30 Cardhu PCA954x reset
Lars-Peter Clausen (2):
iio: ad9523: Fix displayed phase
iio: ad9523: Fix return value for ad952x_store()
Mahesh Salgaonkar (1):
powerpc/pseries: Fix endianness while restoring of r3 in MCE handler.
Mike Snitzer (1):
dm cache metadata: save in-core policy_hint_size to on-disk superblock
Mikulas Patocka (2):
fb: fix lost console when the user unplugs a USB adapter
udlfb: set optimal write delay
Peter Zijlstra (1):
mm/tlb: Remove tlb_remove_table() non-concurrent condition
Richard Weinberger (3):
ubifs: Fix memory leak in lprobs self-check Revert "UBIFS: Fix potential integer overflow in allocation"
ubifs: Fix synced_i_size calculation for xattr inodes
Shan Hai (1):
bcache: release dc->writeback_lock properly in bch_writeback_thread()
Snild Dolkow (1):
kthread, tracing: Don't expose half-written comm when creating kthreads
Steven Rostedt (VMware) (3):
tracing: Do not call start/stop() functions when tracing_on does not change tracing/blktrace: Fix to allow setting same value
uprobes: Use synchronize_rcu() not synchronize_sched()
Tomas Bortoli (3):
net/9p/client.c: version pointer uninitialized net/9p/trans_fd.c: fix race-condition by flushing workqueue before the kfree() 9p: fix multiple NULL-pointer-dereferences
Vignesh R (1):
pwm: tiehrpwm: Fix disabling of output of PWMs
jiangyiwen (1):
9p/virtio: fix off-by-one error in sg list bounds check
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 121 +SUBLEVEL = 122 EXTRAVERSION = NAME = Diseased Newt
arch/alpha/kernel/osf_sys.c +28 -36
102 lines not on this page · raw message
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -0
@@ -200,6 +200,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x70>; + reset-gpio = <&gpio TEGRA_GPIO(BB, 0) GPIO_ACTIVE_LOW>; }; };
arch/powerpc/include/asm/fadump.h +0 -3
@@ -194,9 +194,6 @@ struct fadump_crash_info_header {struct cpumask cpu_online_mask; }; -/* Crash memory ranges */ -#define INIT_CRASHMEM_RANGES (INIT_MEMBLOCK_REGIONS + 2) -struct fad_crash_memory_ranges {unsigned long long base;unsigned long long size;
arch/powerpc/kernel/fadump.c +78 -14
174 lines not on this page · raw message
arch/powerpc/platforms/pseries/ras.c +1 -1
@@ -298,7 +298,7 @@ static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs) } savep =__va (regs->gpr[3 ]); - regs->gpr[3 ] = savep[0 ];/* restore original r3 */ + regs->gpr[3 ] =be64_to_cpu (savep[0 ]);/* restore original r3 */ /* If it isn't an extended log we can use the per cpu 64bit buffer */ h = (struct rtas_error_log *)&savep[1 ];
arch/sparc/kernel/sys_sparc_32.c +13 -9
@@ -201,23 +201,27 @@ SYSCALL_DEFINE5(rt_sigaction, int, sig,asmlinkage long sys_getdomainname (char __user *name,int len) { -int nlen, err; - +int nlen, err; +char tmp[__NEW_UTS_LEN +1 ]; +if (len <0 )return -EINVAL ; -down_read (&uts_sem); - +down_read (&uts_sem); + nlen =strlen (utsname ()->domainname) +1 ; err = -EINVAL ;if (nlen > len) - goto out; + goto out_unlock; +memcpy (tmp,utsname ()->domainname, nlen); - err = -EFAULT ; -if (!copy_to_user (name,utsname ()->domainname, nlen)) - err =0 ; +up_read (&uts_sem); -out: +if (copy_to_user (name, tmp, nlen)) +return -EFAULT ; +return 0 ; + +out_unlock:up_read (&uts_sem);return err; }
arch/sparc/kernel/sys_sparc_64.c +12 -8
@@ -524,23 +524,27 @@ extern void check_pending(int signum); SYSCALL_DEFINE2(getdomainname, char __user *, name, int, len) { -int nlen, err; +int nlen, err; +char tmp[__NEW_UTS_LEN +1 ];if (len <0 )return -EINVAL ; -down_read (&uts_sem); - +down_read (&uts_sem); + nlen =strlen (utsname ()->domainname) +1 ; err = -EINVAL ;if (nlen > len) - goto out; + goto out_unlock; +memcpy (tmp,utsname ()->domainname, nlen); + +up_read (&uts_sem); - err = -EFAULT ; -if (!copy_to_user (name,utsname ()->domainname, nlen)) - err =0 ; +if (copy_to_user (name, tmp, nlen)) +return -EFAULT ; +return 0 ; -out: +out_unlock:up_read (&uts_sem);return err; }
drivers/iio/frequency/ad9523.c +2 -2
@@ -507,7 +507,7 @@ static ssize_t ad9523_store(struct device *dev,return ret;if (!state) -return 0 ; +return len;mutex_lock (&indio_dev->mlock);switch ((u32 )this_attr->address) {
@@ -641,7 +641,7 @@ static int ad9523_read_raw(struct iio_dev *indio_dev, code = (AD9523_CLK_DIST_DIV_PHASE_REV (ret) *3141592 ) /AD9523_CLK_DIST_DIV_REV (ret); *val = code /1000000 ; - *val2 = (code %1000000 ) *10 ; + *val2 = code %1000000 ;return IIO_VAL_INT_PLUS_MICRO ;default :return -EINVAL ;
drivers/md/bcache/writeback.c +3 -1
@@ -462,8 +462,10 @@ static int bch_writeback_thread(void *arg)* data on cache. BCACHE_DEV_DETACHING flag is set in * bch_cached_dev_detach(). */ -if (test_bit (BCACHE_DEV_DETACHING , &dc->disk.flags)) +if (test_bit (BCACHE_DEV_DETACHING , &dc->disk.flags)) { +up_write (&dc->writeback_lock);break ; + } }up_write (&dc->writeback_lock);
drivers/md/dm-cache-metadata.c +2 -1
@@ -324,7 +324,7 @@ static int __write_initial_superblock(struct dm_cache_metadata *cmd) disk_super->version =cpu_to_le32 (MAX_CACHE_VERSION );memset (disk_super->policy_name,0 ,sizeof (disk_super->policy_name));memset (disk_super->policy_version,0 ,sizeof (disk_super->policy_version)); - disk_super->policy_hint_size =0 ; + disk_super->policy_hint_size =cpu_to_le32 (0 );__copy_sm_root (cmd, disk_super);
@@ -635,6 +635,7 @@ static int __commit_transaction(struct dm_cache_metadata *cmd, disk_super->policy_version[0 ] =cpu_to_le32 (cmd->policy_version[0 ]); disk_super->policy_version[1 ] =cpu_to_le32 (cmd->policy_version[1 ]); disk_super->policy_version[2 ] =cpu_to_le32 (cmd->policy_version[2 ]); + disk_super->policy_hint_size =cpu_to_le32 (cmd->policy_hint_size); disk_super->read_hits =cpu_to_le32 (cmd->stats.read_hits); disk_super->read_misses =cpu_to_le32 (cmd->stats.read_misses);
drivers/pwm/pwm-tiehrpwm.c +2 -0
@@ -384,6 +384,8 @@ static void ehrpwm_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) aqcsfrc_mask =AQCSFRC_CSFA_MASK ; } +/* Update shadow register first before modifying active register */ +ehrpwm_modify (pc->mmio_base,AQCSFRC , aqcsfrc_mask, aqcsfrc_val);/* * Changes to immediate action on Action Qualifier. This puts * Action Qualifier control on PWM output from next TBCLK
drivers/spi/spi-davinci.c +1 -1
@@ -230,7 +230,7 @@ static void davinci_spi_chipselect(struct spi_device *spi, int value) }/* program delay transfers if tx_delay is non zero */ -if (spicfg->wdelay) +if (spicfg && spicfg->wdelay) spidat1 |=SPIDAT1_WDEL ;/*
drivers/video/fbdev/core/fbmem.c +32 -6
@@ -1687,12 +1687,12 @@ static int do_register_framebuffer(struct fb_info *fb_info)return 0 ; } -static int do_unregister_framebuffer (struct fb_info *fb_info) +static int unbind_console (struct fb_info *fb_info) {struct fb_event event; -int i, ret =0 ; +int ret; +int i = fb_info->node; - i = fb_info->node;if (i <0 || i >=FB_MAX || registered_fb[i] != fb_info)return -EINVAL ;
@@ -1707,17 +1707,29 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)unlock_fb_info (fb_info);console_unlock (); +return ret; +} + +static int __unlink_framebuffer (struct fb_info *fb_info); + +static int do_unregister_framebuffer (struct fb_info *fb_info) +{ +struct fb_event event; +int ret; + + ret =unbind_console (fb_info); +if (ret)return -EINVAL ;pm_vt_switch_unregister (fb_info->dev); -unlink_framebuffer (fb_info); +__unlink_framebuffer (fb_info);if (fb_info->pixmap.addr && (fb_info->pixmap.flags &FB_PIXMAP_DEFAULT ))kfree (fb_info->pixmap.addr);fb_destroy_modelist (&fb_info->modelist); - registered_fb[i] =NULL ; + registered_fb[fb_info->node] =NULL ; num_registered_fb--;fb_cleanup_device (fb_info); event.info = fb_info;
@@ -1730,7 +1742,7 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)return 0 ; } -int unlink_framebuffer (struct fb_info *fb_info) +static int __unlink_framebuffer (struct fb_info *fb_info) {int i;
@@ -1742,6 +1754,20 @@ int unlink_framebuffer(struct fb_info *fb_info)device_destroy (fb_class,MKDEV (FB_MAJOR , i)); fb_info->dev =NULL ; } + +return 0 ; +} + +int unlink_framebuffer (struct fb_info *fb_info) +{ +int ret; + + ret =__unlink_framebuffer (fb_info); +if (ret) +return ret; + +unbind_console (fb_info); +return 0 ; }EXPORT_SYMBOL (unlink_framebuffer);
fs/nfs/blocklayout/dev.c +1 -1
@@ -157,7 +157,7 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset, chunk =div_u64 (offset, dev->chunk_size);div_u64_rem (chunk, dev->nr_children, &chunk_idx); -if (chunk_idx > dev->nr_children) { +if (chunk_idx >= dev->nr_children) {dprintk ("%s: invalid chunk idx %d (%lld/%lld)\n" , __func__, chunk_idx, offset, dev->chunk_size);/* error, should not happen */
fs/ubifs/journal.c +6 -1
@@ -656,6 +656,11 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir,spin_lock (&ui->ui_lock); ui->synced_i_size = ui->ui_size;spin_unlock (&ui->ui_lock); +if (xent) { +spin_lock (&host_ui->ui_lock); + host_ui->synced_i_size = host_ui->ui_size; +spin_unlock (&host_ui->ui_lock); + }mark_inode_clean (c, ui);mark_inode_clean (c, host_ui);return 0 ;
@@ -1101,7 +1106,7 @@ static int recomp_data_node(struct ubifs_data_node *dn, int *new_len)int err, len, compr_type, out_len; out_len =le32_to_cpu (dn->size); - buf =kmalloc_array (out_len,WORST_COMPR_FACTOR ,GFP_NOFS ); + buf =kmalloc (out_len *WORST_COMPR_FACTOR ,GFP_NOFS );if (!buf)return -ENOMEM ;
fs/ubifs/lprops.c +4 -4
@@ -1091,10 +1091,6 @@ static int scan_check_cb(struct ubifs_info *c, } } - buf =__vmalloc (c->leb_size,GFP_NOFS ,PAGE_KERNEL ); -if (!buf) -return -ENOMEM ; -/* * After an unclean unmount, empty and freeable LEBs * may contain garbage - do not scan them.
@@ -1113,6 +1109,10 @@ static int scan_check_cb(struct ubifs_info *c,return LPT_SCAN_CONTINUE ; } + buf =__vmalloc (c->leb_size,GFP_NOFS ,PAGE_KERNEL ); +if (!buf) +return -ENOMEM ; + sleb =ubifs_scan (c, lnum,0 , buf,0 );if (IS_ERR (sleb)) { ret =PTR_ERR (sleb);
fs/xattr.c +1 -1
@@ -455,7 +455,7 @@ getxattr(struct dentry *d, const char __user *name, void __user *value,if (error >0 ) {if ((strcmp (kname,XATTR_NAME_POSIX_ACL_ACCESS ) ==0 ) || (strcmp (kname,XATTR_NAME_POSIX_ACL_DEFAULT ) ==0 )) -posix_acl_fix_xattr_to_user (kvalue, size); +posix_acl_fix_xattr_to_user (kvalue, error);if (size &©_to_user (value, kvalue, error)) error = -EFAULT ; }else if (error == -ERANGE && size >=XATTR_SIZE_MAX ) {
include/video/udlfb.h +1 -1
@@ -87,7 +87,7 @@ struct dlfb_data {#define MIN_RAW_PIX_BYTES 2#define MIN_RAW_CMD_BYTES (RAW_HEADER_BYTES + MIN_RAW_PIX_BYTES) -#define DL_DEFIO_WRITE_DELAY 5/* fb_deferred_io.delay in jiffies */ +#define DL_DEFIO_WRITE_DELAY msecs_to_jiffies(HZ <= 300 ? 4 : 10)/* optimal value for 720p video */ #define DL_DEFIO_WRITE_DISABLE (HZ*60)/* "disable" with long delay */ /* remove these once align.h patch is taken into kernel */
kernel/kthread.c +7 -1
@@ -309,10 +309,16 @@ struct task_struct *kthread_create_on_node(int (*threadfn)(void *data), task = create->result;if (!IS_ERR (task)) {static const struct sched_param param = { .sched_priority =0 }; +char name[TASK_COMM_LEN ];va_list args;va_start (args, namefmt); -vsnprintf (task->comm,sizeof (task->comm), namefmt, args); +/* +* task is already visible to other tasks, so updating +* COMM must be protected. +*/ +vsnprintf (name,sizeof (name), namefmt, args); +set_task_comm (task, name);va_end (args);/* * root may have changed our (kthreadd's) priority or CPU mask.
kernel/sys.c +45 -50
171 lines not on this page · raw message
kernel/trace/blktrace.c +4 -0
@@ -1734,6 +1734,10 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev,mutex_lock (&bdev->bd_mutex);if (attr == &dev_attr_enable) { +if (!!value == !!q->blk_trace) { + ret =0 ; + goto out_unlock_bdev; + }if (value) ret =blk_trace_setup_queue (q, bdev);else
kernel/trace/trace.c +3 -1
@@ -6209,7 +6209,9 @@ rb_simple_write(struct file *filp, const char __user *ubuf,if (buffer) {mutex_lock (&trace_types_lock); -if (val) { +if (!!val ==tracer_tracing_is_on (tr)) { + val =0 ;/* do nothing */ + }else if (val) {tracer_tracing_on (tr);if (tr->current_trace->start) tr->current_trace->start (tr);
kernel/trace/trace_uprobe.c +1 -1
@@ -957,7 +957,7 @@ probe_event_disable(struct trace_uprobe *tu, struct ftrace_event_file *file)list_del_rcu (&link->list);/* synchronize with u{,ret}probe_trace_func */ -synchronize_sched (); +synchronize_rcu ();kfree (link);if (!list_empty (&tu->tp.files))
kernel/user_namespace.c +19 -20
@@ -600,9 +600,26 @@ static ssize_t map_write(struct file *file, const char __user *buf,struct uid_gid_map new_map;unsigned idx;struct uid_gid_extent *extent =NULL ; -unsigned long page =0 ; +unsigned long page;char *kbuf, *pos, *next_line; -ssize_t ret = -EINVAL ; +ssize_t ret; + +/* Only allow < page size writes at the beginning of the file */ +if ((*ppos !=0 ) || (count >=PAGE_SIZE )) +return -EINVAL ; + +/* Get a buffer */ + page =__get_free_page (GFP_TEMPORARY ); + kbuf = (char *) page; +if (!page) +return -ENOMEM ; + +/* Slurp in the user data */ +if (copy_from_user (kbuf, buf, count)) { +free_page (page); +return -EFAULT ; + } + kbuf[count] ='\0' ;/* * The userns_state_mutex serializes all writes to any given map.
@@ -636,24 +653,6 @@ static ssize_t map_write(struct file *file, const char __user *buf,if (cap_valid (cap_setid) && !file_ns_capable (file, ns,CAP_SYS_ADMIN )) goto out; -/* Get a buffer */ - ret = -ENOMEM ; - page =__get_free_page (GFP_TEMPORARY ); - kbuf = (char *) page; -if (!page) - goto out; - -/* Only allow <= page size writes at the beginning of the file */ - ret = -EINVAL ; -if ((*ppos !=0 ) || (count >=PAGE_SIZE )) - goto out; - -/* Slurp in the user data */ - ret = -EFAULT ; -if (copy_from_user (kbuf, buf, count)) - goto out; - kbuf[count] ='\0' ; -/* Parse the user data */ ret = -EINVAL ; pos = kbuf;
kernel/utsname_sysctl.c +25 -16
66 lines not on this page · raw message
mm/memory.c +0 -9
@@ -359,15 +359,6 @@ void tlb_remove_table(struct mmu_gather *tlb, void *table) {struct mmu_table_batch **batch = &tlb->batch; -/* -* When there's less then two users of this mm there cannot be a -* concurrent page-table walk. -*/ -if (atomic_read (&tlb->mm->mm_users) <2 ) { -__tlb_remove_table (table); -return ; - } -if (*batch ==NULL ) { *batch = (struct mmu_table_batch *)__get_free_page (GFP_NOWAIT | __GFP_NOWARN);if (*batch ==NULL ) {
net/9p/client.c +1 -1
@@ -938,7 +938,7 @@ static int p9_client_version(struct p9_client *c) {int err =0 ;struct p9_req_t *req; -char *version; +char *version =NULL ;int msize; p9_debug(P9_DEBUG_9P, ">>> TVERSION msize %d protocol %d\n",
net/9p/trans_fd.c +6 -1
@@ -185,6 +185,8 @@ static void p9_mux_poll_stop(struct p9_conn *m)spin_lock_irqsave (&p9_poll_lock, flags);list_del_init (&m->poll_pending_link);spin_unlock_irqrestore (&p9_poll_lock, flags); + +flush_work (&p9_poll_work); }/**
@@ -932,7 +934,7 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)if (err <0 )return err; -if (valid_ipaddr4 (addr) <0 ) +if (addr ==NULL ||valid_ipaddr4 (addr) <0 )return -EINVAL ; csocket =NULL ;
@@ -980,6 +982,9 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args) csocket =NULL ; +if (addr ==NULL ) +return -EINVAL ; +if (strlen (addr) >=UNIX_PATH_MAX ) {pr_err ("%s (%d): address too long: %s\n" , __func__,task_pid_nr (current), addr);
net/9p/trans_rdma.c +3 -0
@@ -623,6 +623,9 @@ rdma_create_trans(struct p9_client *client, const char *addr, char *args)struct ib_qp_init_attr qp_attr;struct ib_device_attr devattr; +if (addr ==NULL ) +return -EINVAL ; +/* Parse the transport specific mount options */ err =parse_opts (args, &opts);if (err <0 )
net/9p/trans_virtio.c +5 -1
@@ -192,7 +192,7 @@ static int pack_sg_list(struct scatterlist *sg, int start, s =rest_of_page (data);if (s > count) s = count; -BUG_ON (index > limit); +BUG_ON (index >= limit);/* Make sure we don't terminate early. */ sg_unmark_end (&sg[index]);sg_set_buf (&sg[index++], data, s);
@@ -238,6 +238,7 @@ pack_sg_list_p(struct scatterlist *sg, int start, int limit, s =rest_of_page (data);if (s > count) s = count; +BUG_ON (index >= limit);/* Make sure we don't terminate early. */ sg_unmark_end (&sg[index]);sg_set_page (&sg[index++], pdata[i++], s, data_off);
@@ -616,6 +617,9 @@ p9_virtio_create(struct p9_client *client, const char *devname, char *args)int ret = -ENOENT ;int found =0 ; +if (devname ==NULL ) +return -EINVAL ; +mutex_lock (&virtio_9p_lock);list_for_each_entry (chan, &virtio_chan_list, chan_list) { if (!strncmp(devname, chan->tag, chan->tag_len) &&