Linux 3.18.121
Greg KH
maintainerI'm announcing the release of the 3.18.121 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/arc/include/asm/delay.h | 3 arch/arc/mm/cache_arc700.c | 7 - arch/arm/kvm/mmu.c | 42 +++++-- arch/arm64/mm/init.c | 6 - arch/mips/bcm47xx/setup.c | 6 - arch/mips/include/asm/mipsregs.h | 3 arch/mips/include/asm/processor.h | 2 arch/mips/kernel/ptrace.c | 2 arch/mips/kernel/ptrace32.c | 2 arch/s390/include/asm/qdio.h | 1 arch/s390/mm/fault.c | 2 arch/s390/pci/pci.c | 2 arch/x86/kernel/process_64.c | 1 drivers/cdrom/cdrom.c | 2 drivers/gpu/drm/udl/udl_fb.c | 2 drivers/gpu/drm/udl/udl_main.c | 35 +++--- drivers/net/can/mscan/mpc5xxx_can.c | 5 drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 1 drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 13 +- drivers/net/ethernet/cisco/enic/enic_main.c | 78 ++++---------- drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 1 drivers/net/wan/lmc/lmc_main.c | 2 drivers/pinctrl/freescale/pinctrl-imx1-core.c | 2 drivers/s390/cio/qdio_main.c | 5 drivers/scsi/fcoe/fcoe_ctlr.c | 4 drivers/scsi/libiscsi.c | 12 +- drivers/scsi/scsi_sysfs.c | 20 +++ drivers/scsi/vmw_pvscsi.c | 11 + drivers/staging/imx-drm/imx-ldb.c | 9 + drivers/staging/media/omap4iss/iss_video.c | 3 drivers/usb/gadget/function/f_uac2.c | 20 +-- drivers/usb/gadget/udc/r8a66597-udc.c | 6 - drivers/usb/phy/phy-fsl-usb.c | 4 fs/btrfs/extent-tree.c | 2 fs/cachefiles/namei.c | 1 fs/cachefiles/rdwr.c | 17 ++- fs/ext4/namei.c | 1 fs/fscache/operation.c | 6 - fs/fuse/dev.c | 7 - fs/fuse/file.c | 1 fs/sysfs/file.c | 44 +++++++ include/linux/sysfs.h | 14 ++ kernel/kprobes.c | 4 kernel/sysctl.c | 3 mm/memory.c | 3 mm/zswap.c | 9 + net/caif/caif_dev.c | 4 net/ipv4/cipso_ipv4.c | 12 +- net/mac80211/util.c | 3 net/wireless/nl80211.c | 1 net/xfrm/xfrm_policy.c | 3 net/xfrm/xfrm_user.c | 10 + sound/soc/sirf/sirf-usp.c | 7 - tools/power/x86/turbostat/turbostat.c | 8 - tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc | 28 +++++ tools/usb/ffs-test.c | 19 ++- 57 files changed, 353 insertions(+), 170 deletions(-)
Andrey Ryabinin (1):
fuse: Don't access pipe->buffers without pipe_lock()
Bart Van Assche (2):
scsi: sysfs: Introduce sysfs_{un,}break_active_protection()
scsi: core: Avoid that SCSI device removal through sysfs triggers a deadlock
Bernd Edlinger (1):
nl80211: Add a missing break in parse_station_flags
Calvin Walton (1):
tools/power turbostat: Read extended processor family from CPUID
Claudio Imbrenda (1):
s390/kvm: fix deadlock when killed by oom
Colin Ian King (1):
drivers: net: lmc: fix case value for target abort error
Dan Carpenter (1):
pinctrl: freescale: off by one in imx1_pinconf_group_dbg_show()
Eric Sandeen (1):
ext4: reset error code in ext4_find_entry in fallback
Ethan Zhao (1):
sched/sysctl: Check user input value of sysctl_sched_time_avg
Eugeniu Rosca (1):
usb: gadget: f_uac2: fix endianness of 'struct cntrl_*_lay3'
Florian Westphal (2):
xfrm: free skb if nlsk pointer is NULL
atl1c: reserve min skb headroom
Govindarajulu Varadarajan (1):
enic: handle mtu change for vf properly
Greg Hackmann (1):
arm64: mm: check for upper PAGE_SHIFT bits in pfn_valid()
Greg Kroah-Hartman (1):
Linux 3.18.121
Guenter Roeck (1):
media: staging: omap4iss: Include asm/cacheflush.h after generic includes
Gustavo A. R. Silva (1):
ASoC: sirf: Fix potential NULL pointer dereference
Jia-Ju Bai (2):
usb: gadget: r8a66597: Fix two possible sleep-in-atomic-context bugs in init_controller()
usb: gadget: r8a66597: Fix a possible sleep-in-atomic-context bugs in r8a66597_queue()
Jim Gill (1):
scsi: vmw_pvscsi: Return DID_RESET for status SAM_STAT_COMMAND_TERMINATED
Johannes Thumshirn (1):
scsi: fcoe: drop frames in ELS LOGO error path
Josef Bacik (1):
btrfs: don't leak ret from do_chunk_alloc
Julian Wiedmann (1):
s390/qdio: reset old sbal_state flags
Kiran Kumar Modukuri (3):
fscache: Allow cancelled operations to be enqueued
cachefiles: Fix refcounting bug in backing-file read monitoring
cachefiles: Wait rather than BUG'ing on "Unexpected object collision"
Kirill Tkhai (1):
fuse: Add missed unlock_page() to fuse_readpages_fill()
Len Brown (1):
tools/power turbostat: fix -S on UP systems
Li Wang (1):
zswap: re-check zswap_is_full() after do zswap_shrink()
Lucas Stach (2):
drm/imx: imx-ldb: disable LDB on driver bind
drm/imx: imx-ldb: check if channel is enabled before printing warning
Maciej W. Rozycki (1):
MIPS: Correct the 64-bit DSP accumulator register size
Masami Hiramatsu (2):
selftests/ftrace: Add snapshot and tracing_on test case
kprobes: Make list and blacklist root user read only
Mikulas Patocka (3):
udl-kms: change down_interruptible to down
udl-kms: handle allocation failure
udl-kms: fix crash due to uninitialized memory
Nicholas Mc Guire (1):
can: mpc5xxx_can: check of_iomap return before use
Peter Senna Tschudin (1):
tools: usb: ffs-test: Fix build on big endian systems
Punit Agrawal (2):
KVM: arm/arm64: Skip updating PTE entry if no change
KVM: arm/arm64: Skip updating PMD entry if no change
Rafał Miłecki (1):
Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum"
Randy Dunlap (3):
usb/phy: fix PPC64 build errors in phy-fsl-usb.c
arc: fix build errors in arc/include/asm/delay.h
arc: fix type warnings in arc/mm/cache.c
Rian Hunter (1):
x86/process: Re-export start_thread()
Scott Bauer (1):
cdrom: Fix info leak/OOB read in cdrom_ioctl_drive_status
Sebastian Ott (1):
s390/pci: fix out of bounds access during irq setup
Shubhrajyoti Datta (1):
net: axienet: Fix double deregister of mdio
Sudarsana Reddy Kalluru (1):
bnx2x: Fix invalid memory access in rss hash config path.
Tommi Rantala (1):
xfrm: fix missing dst_release() after policy blocking lbcast and multicast
Varun Prakash (1):
scsi: libiscsi: fix possible NULL pointer dereference in case of TMF
YueHaibing (1):
net: caif: Add a missing rcu_read_unlock() in caif_flow_cb
jie@[email protected] (1):
mm/memory.c: check return value of ioremap_prot
[email protected] (1):
mac80211: add stations tied to AP_VLANs during hw reconfig
yujuan.qi (1):
Cipso: cipso_v4_optptr enter infinite loop
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 120 +SUBLEVEL = 121 EXTRAVERSION = NAME = Diseased Newt
arch/arc/include/asm/delay.h +3 -0
@@ -17,8 +17,11 @@#ifndef __ASM_ARC_UDELAY_H#define __ASM_ARC_UDELAY_H +#include <asm-generic/types.h> #include <asm/param.h> /* HZ */ +extern unsigned long loops_per_jiffy; +static inline void __delay (unsigned long loops) { __asm__ __volatile__(
arch/arc/mm/cache_arc700.c +4 -3
@@ -642,7 +642,7 @@ void flush_cache_mm(struct mm_struct *mm)void flush_cache_page (struct vm_area_struct *vma,unsigned long u_vaddr,unsigned long pfn) { -unsigned int paddr = pfn <<PAGE_SHIFT ; +phys_addr_t paddr = pfn <<PAGE_SHIFT ; u_vaddr &=PAGE_MASK ;
@@ -662,8 +662,9 @@ void flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long u_vaddr) {/* TBD: do we really need to clear the kernel mapping */ -__flush_dcache_page (page_address (page), u_vaddr); -__flush_dcache_page (page_address (page),page_address (page)); +__flush_dcache_page ((phys_addr_t )page_address (page), u_vaddr); +__flush_dcache_page ((phys_addr_t )page_address (page), + (phys_addr_t )page_address (page)); }
arch/arm/kvm/mmu.c +31 -11
56 lines not on this page · raw message
arch/arm64/mm/init.c +5 -1
@@ -116,7 +116,11 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)#ifdef CONFIG_HAVE_ARCH_PFN_VALID int pfn_valid (unsigned long pfn) { -return memblock_is_memory (pfn <<PAGE_SHIFT ); +phys_addr_t addr = pfn <<PAGE_SHIFT ; + +if ((addr >>PAGE_SHIFT ) != pfn) +return 0 ; +return memblock_is_memory (addr); }EXPORT_SYMBOL (pfn_valid);#endif
arch/mips/bcm47xx/setup.c +0 -6
@@ -269,12 +269,6 @@ static int __init bcm47xx_cpu_fixes(void)*/ if (bcm47xx_bus.bcma.bus.chipinfo.id ==BCMA_CHIP_ID_BCM4706 ) cpu_wait =NULL ; - -/* -* BCM47XX Erratum "R10: PCIe Transactions Periodically Fail" -* Enable ExternalSync for sync instruction to take effect -*/ -set_c0_config7 (MIPS_CONF7_ES );break ;#endif }
arch/mips/include/asm/mipsregs.h +0 -3
@@ -667,8 +667,6 @@#define MIPS_CONF7_WII (_ULCAST_(1) << 31)#define MIPS_CONF7_RPS (_ULCAST_(1) << 2) -/* ExternalSync */ -#define MIPS_CONF7_ES (_ULCAST_(1) << 8)#define MIPS_CONF7_IAR (_ULCAST_(1) << 10)#define MIPS_CONF7_AR (_ULCAST_(1) << 16)
@@ -1865,7 +1863,6 @@ __BUILD_SET_C0(status) __BUILD_SET_C0(cause) __BUILD_SET_C0(config) __BUILD_SET_C0(config5) -__BUILD_SET_C0(config7) __BUILD_SET_C0(intcontrol) __BUILD_SET_C0(intctl) __BUILD_SET_C0(srsmap)
arch/mips/include/asm/processor.h +1 -1
@@ -143,7 +143,7 @@ struct mips_fpu_struct {#define NUM_DSP_REGS 6 -typedef __u32 dspreg_t ; +typedef unsigned long dspreg_t ;struct mips_dsp_state {dspreg_t dspr[NUM_DSP_REGS ];
arch/mips/kernel/ptrace.c +1 -1
@@ -751,7 +751,7 @@ long arch_ptrace(struct task_struct *child, long request, goto out; } dregs =__get_dsp_regs (child); - tmp = (unsigned long ) (dregs[addr -DSP_BASE ]); + tmp = dregs[addr -DSP_BASE ];break ; }case DSP_CONTROL :
arch/mips/kernel/ptrace32.c +1 -1
@@ -140,7 +140,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, goto out; } dregs =__get_dsp_regs (child); - tmp = (unsigned long ) (dregs[addr -DSP_BASE ]); + tmp = dregs[addr -DSP_BASE ];break ; }case DSP_CONTROL :
arch/s390/include/asm/qdio.h +0 -1
@@ -271,7 +271,6 @@ struct qdio_outbuf_state {void *user; }; -#define QDIO_OUTBUF_STATE_FLAG_NONE 0x00#define QDIO_OUTBUF_STATE_FLAG_PENDING 0x01#define CHSC_AC1_INITIATE_INPUTQ 0x80
arch/s390/mm/fault.c +2 -0
@@ -494,6 +494,8 @@ retry:/* No reason to continue if interrupted by SIGKILL. */ if ((fault &VM_FAULT_RETRY ) &&fatal_signal_pending (current)) { fault =VM_FAULT_SIGNAL ; +if (flags &FAULT_FLAG_RETRY_NOWAIT ) + goto out_up; goto out; }if (unlikely (fault &VM_FAULT_ERROR ))
arch/s390/pci/pci.c +2 -0
@@ -397,6 +397,8 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) hwirq =0 ;list_for_each_entry (msi, &pdev->msi_list, list) { rc = -EIO ; +if (hwirq >= msi_vecs) +break ; irq =irq_alloc_desc (0 );/* Alloc irq on node 0 */ if (irq <0 ) goto out_msi;
arch/x86/kernel/process_64.c +1 -0
@@ -438,6 +438,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)return prev_p; } +EXPORT_SYMBOL_GPL (start_thread);void set_personality_64bit (void ) {
drivers/cdrom/cdrom.c +1 -1
@@ -2525,7 +2525,7 @@ static int cdrom_ioctl_drive_status(struct cdrom_device_info *cdi,if (!CDROM_CAN (CDC_SELECT_DISC ) || (arg ==CDSL_CURRENT || arg ==CDSL_NONE ))return cdi->ops->drive_status (cdi,CDSL_CURRENT ); -if (((int )arg >= cdi->capacity)) +if (arg >= cdi->capacity)return -EINVAL ;return cdrom_slot_status (cdi, arg); }
drivers/gpu/drm/udl/udl_fb.c +1 -1
@@ -341,7 +341,7 @@ static int udl_fb_open(struct fb_info *info, int user)struct fb_deferred_io *fbdefio; - fbdefio =kmalloc (sizeof (struct fb_deferred_io ),GFP_KERNEL ); + fbdefio =kzalloc (sizeof (struct fb_deferred_io ),GFP_KERNEL );if (fbdefio) { fbdefio->delay =DL_DEFIO_WRITE_DELAY ;
drivers/gpu/drm/udl/udl_main.c +19 -16
@@ -141,18 +141,13 @@ static void udl_free_urb_list(struct drm_device *dev)struct list_head *node;struct urb_node *unode;struct urb *urb; -int ret;unsigned long flags;DRM_DEBUG ("Waiting for completes and freeing all render urbs\n" );/* keep waiting and freeing, until we've got 'em all */ while (count--) { - -/* Getting interrupted means a leak, but ok at shutdown*/ - ret =down_interruptible (&udl->urbs.limit_sem); -if (ret) -break ; +down (&udl->urbs.limit_sem);spin_lock_irqsave (&udl->urbs.lock, flags);
@@ -176,17 +171,22 @@ static void udl_free_urb_list(struct drm_device *dev)static int udl_alloc_urb_list (struct drm_device *dev,int count,size_t size) {struct udl_device *udl = dev->dev_private; -int i =0 ;struct urb *urb;struct urb_node *unode;char *buf; +size_t wanted_size = count * size;spin_lock_init (&udl->urbs.lock); +retry: udl->urbs.size = size;INIT_LIST_HEAD (&udl->urbs.list); -while (i < count) { +sema_init (&udl->urbs.limit_sem,0 ); + udl->urbs.count =0 ; + udl->urbs.available =0 ; + +while (udl->urbs.count * size < wanted_size) { unode =kzalloc (sizeof (struct urb_node ),GFP_KERNEL );if (!unode)break ;
@@ -202,11 +202,16 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size) } unode->urb = urb; - buf =usb_alloc_coherent (udl->udev,MAX_TRANSFER ,GFP_KERNEL , + buf =usb_alloc_coherent (udl->udev, size,GFP_KERNEL , &urb->transfer_dma);if (!buf) {kfree (unode);usb_free_urb (urb); +if (size >PAGE_SIZE ) { + size /=2 ; +udl_free_urb_list (dev); + goto retry; + }break ; }
@@ -217,16 +222,14 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)list_add_tail (&unode->entry, &udl->urbs.list); - i++; +up (&udl->urbs.limit_sem); + udl->urbs.count++; + udl->urbs.available++; } -sema_init (&udl->urbs.limit_sem, i); - udl->urbs.count = i; - udl->urbs.available = i; - -DRM_DEBUG ("allocated %d %d byte urbs\n" , i, (int ) size); +DRM_DEBUG ("allocated %d %d byte urbs\n" , udl->urbs.count, (int ) size); -return i; +return udl->urbs.count; }struct urb *udl_get_urb (struct drm_device *dev)
drivers/net/can/mscan/mpc5xxx_can.c +5 -0
@@ -86,6 +86,11 @@ static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,return 0 ; } cdm =of_iomap (np_cdm,0 ); +if (!cdm) { +of_node_put (np_cdm); +dev_err (&ofdev->dev,"can't map clock node!\n" ); +return 0 ; + }if (in_8 (&cdm->ipb_clk_sel) &0x1 ) freq *=2 ;
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1 -0
@@ -1674,6 +1674,7 @@ static struct sk_buff *atl1c_alloc_skb(struct atl1c_adapter *adapter) skb =build_skb (page_address (page) + adapter->rx_page_offset, adapter->rx_frag_size);if (likely (skb)) { +skb_reserve (skb,NET_SKB_PAD ); adapter->rx_page_offset += adapter->rx_frag_size;if (adapter->rx_page_offset >=PAGE_SIZE ) adapter->rx_page =NULL ;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +10 -3
@@ -3296,14 +3296,18 @@ static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)DP (BNX2X_MSG_ETHTOOL ,"rss re-configured, UDP 4-tupple %s\n" , udp_rss_requested ?"enabled" :"disabled" ); -return bnx2x_rss (bp, &bp->rss_conf_obj, false, true); +if (bp->state ==BNX2X_STATE_OPEN ) +return bnx2x_rss (bp, &bp->rss_conf_obj, false, + true); }else if ((info->flow_type ==UDP_V6_FLOW ) && (bp->rss_conf_obj.udp_rss_v6 != udp_rss_requested)) { bp->rss_conf_obj.udp_rss_v6 = udp_rss_requested;DP (BNX2X_MSG_ETHTOOL ,"rss re-configured, UDP 4-tupple %s\n" , udp_rss_requested ?"enabled" :"disabled" ); -return bnx2x_rss (bp, &bp->rss_conf_obj, false, true); +if (bp->state ==BNX2X_STATE_OPEN ) +return bnx2x_rss (bp, &bp->rss_conf_obj, false, + true); }return 0 ;
@@ -3401,7 +3405,10 @@ static int bnx2x_set_rxfh(struct net_device *dev, const u32 *indir, bp->rss_conf_obj.ind_table[i] = indir[i] + bp->fp->cl_id; } -return bnx2x_config_rss_eth (bp, false); +if (bp->state ==BNX2X_STATE_OPEN ) +return bnx2x_config_rss_eth (bp, false); + +return 0 ; }/**
drivers/net/ethernet/cisco/enic/enic_main.c +27 -51
104 lines not on this page · raw message
drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c +1 -0
@@ -219,6 +219,7 @@ issue: ret =of_mdiobus_register (bus, np1);if (ret) {mdiobus_free (bus); + lp->mii_bus =NULL ;return ret; }return 0 ;
drivers/net/wan/lmc/lmc_main.c +1 -1
@@ -1384,7 +1384,7 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/case 0x001 :printk (KERN_WARNING "%s: Master Abort (naughty)\n" , dev->name);break ; -case 0x010 : +case 0x002 :printk (KERN_WARNING "%s: Target Abort (not so naughty)\n" , dev->name);break ;default :
drivers/pinctrl/freescale/pinctrl-imx1-core.c +1 -1
@@ -435,7 +435,7 @@ static void imx1_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,const char *name;int i, ret; -if (group > info->ngroups) +if (group >= info->ngroups)return ;seq_puts (s,"\n" );
drivers/s390/cio/qdio_main.c +2 -3
@@ -640,21 +640,20 @@ static inline unsigned long qdio_aob_for_buffer(struct qdio_output_q *q,unsigned long phys_aob =0 ;if (!q->use_cq) - goto out; +return 0 ;if (!q->aobs[bufnr]) {struct qaob *aob =qdio_allocate_aob (); q->aobs[bufnr] = aob; }if (q->aobs[bufnr]) { - q->sbal_state[bufnr].flags =QDIO_OUTBUF_STATE_FLAG_NONE ; q->sbal_state[bufnr].aob = q->aobs[bufnr]; q->aobs[bufnr]->user1 = (u64 ) q->sbal_state[bufnr].user; phys_aob =virt_to_phys (q->aobs[bufnr]);WARN_ON_ONCE (phys_aob &0xFF ); } -out: + q->sbal_state[bufnr].flags =0 ;return phys_aob; }
drivers/scsi/fcoe/fcoe_ctlr.c +2 -2
@@ -752,9 +752,9 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr *fip, struct fc_lport *lport,case ELS_LOGO :if (fip->mode ==FIP_MODE_VN2VN ) {if (fip->state !=FIP_ST_VNMP_UP ) -return -EINVAL ; + goto drop;if (ntoh24 (fh->fh_d_id) ==FC_FID_FLOGI ) -return -EINVAL ; + goto drop; }else {if (fip->state !=FIP_ST_ENABLED )return 0 ;
drivers/scsi/libiscsi.c +6 -6
@@ -283,11 +283,11 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)*/ if (opcode !=ISCSI_OP_SCSI_DATA_OUT ) {iscsi_conn_printk (KERN_INFO , conn, -"task [op %x/%x itt " +"task [op %x itt " "0x%x/0x%x] " "rejected.\n" , - task->hdr->opcode, opcode, - task->itt, task->hdr_itt); + opcode, task->itt, + task->hdr_itt);return -EACCES ; }/*
@@ -296,10 +296,10 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)*/ if (conn->session->fast_abort) {iscsi_conn_printk (KERN_INFO , conn, -"task [op %x/%x itt " +"task [op %x itt " "0x%x/0x%x] fast abort.\n" , - task->hdr->opcode, opcode, - task->itt, task->hdr_itt); + opcode, task->itt, + task->hdr_itt);return -EACCES ; }break ;
drivers/scsi/scsi_sysfs.c +18 -2
@@ -676,8 +676,24 @@ static ssize_t sdev_store_delete(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - if (device_remove_file_self(dev, attr)) - scsi_remove_device(to_scsi_device(dev)); + struct kernfs_node *kn; + + kn =sysfs_break_active_protection (&dev->kobj, &attr->attr); +WARN_ON_ONCE (!kn); +/* +* Concurrent writes into the "delete" sysfs attribute may trigger +* concurrent calls to device_remove_file() and scsi_remove_device(). +* device_remove_file() handles concurrent removal calls by +* serializing these and by ignoring the second and later removal +* attempts. Concurrent calls of scsi_remove_device() are +* serialized. The second and later calls of scsi_remove_device() are +* ignored because the first call of that function changes the device +* state into SDEV_DEL. +*/ +device_remove_file (dev, attr); +scsi_remove_device (to_scsi_device (dev)); +if (kn) +sysfs_unbreak_active_protection (kn);return count; }; static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete);
drivers/scsi/vmw_pvscsi.c +8 -3
@@ -567,9 +567,14 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter, (btstat == BTSTAT_SUCCESS || btstat == BTSTAT_LINKED_COMMAND_COMPLETED || btstat == BTSTAT_LINKED_COMMAND_COMPLETED_WITH_FLAG)) { - cmd->result = (DID_OK << 16) | sdstat; -if (sdstat ==SAM_STAT_CHECK_CONDITION && cmd->sense_buffer) - cmd->result |= (DRIVER_SENSE <<24 ); +if (sdstat ==SAM_STAT_COMMAND_TERMINATED ) { + cmd->result = (DID_RESET <<16 ); + }else { + cmd->result = (DID_OK <<16 ) | sdstat; +if (sdstat ==SAM_STAT_CHECK_CONDITION && + cmd->sense_buffer) + cmd->result |= (DRIVER_SENSE <<24 ); + } } else switch (btstat) {case BTSTAT_SUCCESS :
drivers/staging/imx-drm/imx-ldb.c +6 -3
@@ -460,6 +460,9 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)return PTR_ERR (imx_ldb->regmap); } +/* disable LDB by resetting the control register to POR default */ +regmap_write (imx_ldb->regmap,IOMUXC_GPR2 ,0 ); + imx_ldb->dev = dev;if (of_id)
@@ -497,14 +500,14 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)if (ret || i <0 || i >1 )return -EINVAL ; +if (!of_device_is_available (child)) +continue ; +if (dual && i >0 ) {dev_warn (dev,"dual-channel mode, ignoring second output\n" );continue ; } -if (!of_device_is_available (child)) -continue ; - channel = &imx_ldb->channel[i]; channel->ldb = imx_ldb; channel->chno = i;
drivers/staging/media/omap4iss/iss_video.c +2 -1
@@ -11,7 +11,6 @@* (at your option) any later version. */ -#include <asm/cacheflush.h> #include <linux/clk.h> #include <linux/mm.h> #include <linux/pagemap.h>
@@ -22,6 +21,8 @@#include <media/v4l2-dev.h> #include <media/v4l2-ioctl.h> +#include <asm/cacheflush.h> +#include "iss_video.h" #include "iss.h"
drivers/usb/gadget/function/f_uac2.c +10 -10
@@ -941,14 +941,14 @@ static struct usb_descriptor_header *hs_audio_desc[] = { };struct cntrl_cur_lay3 { -__u32 dCUR; +__le32 dCUR; };struct cntrl_range_lay3 { -__u16 wNumSubRanges; -__u32 dMIN; -__u32 dMAX; -__u32 dRES; +__le16 wNumSubRanges; +__le32 dMIN; +__le32 dMAX; +__le32 dRES; } __packed; static inline void
@@ -1274,9 +1274,9 @@ in_rq_cur(struct usb_function *fn, const struct usb_ctrlrequest *cr)struct cntrl_cur_lay3 c;if (entity_id ==USB_IN_CLK_ID ) - c.dCUR = p_srate; + c.dCUR =cpu_to_le32 (p_srate);else if (entity_id ==USB_OUT_CLK_ID ) - c.dCUR = c_srate; + c.dCUR =cpu_to_le32 (c_srate); value =min_t (unsigned, w_length,sizeof c);memcpy (req->buf, &c, value);
@@ -1314,15 +1314,15 @@ in_rq_range(struct usb_function *fn, const struct usb_ctrlrequest *cr)if (control_selector ==UAC2_CS_CONTROL_SAM_FREQ ) {if (entity_id ==USB_IN_CLK_ID ) - r.dMIN = p_srate; + r.dMIN =cpu_to_le32 (p_srate);else if (entity_id ==USB_OUT_CLK_ID ) - r.dMIN = c_srate; + r.dMIN =cpu_to_le32 (c_srate);else return -EOPNOTSUPP ; r.dMAX = r.dMIN; r.dRES =0 ; - r.wNumSubRanges =1 ; + r.wNumSubRanges =cpu_to_le16 (1 ); value =min_t (unsigned, w_length,sizeof r);memcpy (req->buf, &r, value);
drivers/usb/gadget/udc/r8a66597-udc.c +3 -3
@@ -835,11 +835,11 @@ static void init_controller(struct r8a66597 *r8a66597)r8a66597_bset (r8a66597,XCKE ,SYSCFG0 ); -msleep (3 ); +mdelay (3 );r8a66597_bset (r8a66597,PLLC ,SYSCFG0 ); -msleep (1 ); +mdelay (1 );r8a66597_bset (r8a66597,SCKE ,SYSCFG0 );
@@ -1193,7 +1193,7 @@ __acquires(r8a66597->lock) r8a66597->ep0_req->length =2 ;/* AV: what happens if we get called again before that gets through? */ spin_unlock (&r8a66597->lock); -r8a66597_queue (r8a66597->gadget.ep0, r8a66597->ep0_req,GFP_KERNEL ); +r8a66597_queue (r8a66597->gadget.ep0, r8a66597->ep0_req,GFP_ATOMIC );spin_lock (&r8a66597->lock); }
drivers/usb/phy/phy-fsl-usb.c +3 -1
@@ -913,6 +913,7 @@ int usb_otg_start(struct platform_device *pdev)if (pdata->init && pdata->init (pdev) !=0 )return -EINVAL ; +#ifdef CONFIG_PPC32 if (pdata->big_endian_mmio) { _fsl_readl = _fsl_readl_be; _fsl_writel = _fsl_writel_be;
@@ -920,6 +921,7 @@ int usb_otg_start(struct platform_device *pdev) _fsl_readl = _fsl_readl_le; _fsl_writel = _fsl_writel_le; } +#endif /* request irq */ p_otg->irq =platform_get_irq (pdev,0 );
@@ -1010,7 +1012,7 @@ int usb_otg_start(struct platform_device *pdev)/* * state file in sysfs */ -static int show_fsl_usb2_otg_state (struct device *dev, +static ssize_t show_fsl_usb2_otg_state (struct device *dev,struct device_attribute *attr,char *buf) {struct otg_fsm *fsm = &fsl_otg_dev->fsm;
fs/btrfs/extent-tree.c +1 -1
@@ -4281,7 +4281,7 @@ static int flush_space(struct btrfs_root *root,break ; } -return ret; +return 0 ; } static inline u64
fs/cachefiles/namei.c +0 -1
@@ -193,7 +193,6 @@ wait_for_old_object:pr_err ("\n" );pr_err ("Error: Unexpected object collision\n" );cachefiles_printk_object (object, xobject); -BUG (); }atomic_inc (&xobject->usage);write_unlock (&cache->active_lock);
fs/cachefiles/rdwr.c +12 -5
@@ -27,6 +27,7 @@ static int cachefiles_read_waiter(wait_queue_t *wait, unsigned mode,struct cachefiles_one_read *monitor = container_of(wait, struct cachefiles_one_read, monitor);struct cachefiles_object *object; +struct fscache_retrieval *op = monitor->op;struct wait_bit_key *key = _key;struct page *page = wait->private;
@@ -51,16 +52,22 @@ static int cachefiles_read_waiter(wait_queue_t *wait, unsigned mode,list_del (&wait->task_list);/* move onto the action list and queue for FS-Cache thread pool */ -ASSERT (monitor->op); +ASSERT (op); - object =container_of (monitor->op->op.object, - struct cachefiles_object, fscache); +/* We need to temporarily bump the usage count as we don't own a ref +* here otherwise cachefiles_read_copier() may free the op between the +* monitor being enqueued on the op->to_do list and the op getting +* enqueued on the work queue. +*/ +fscache_get_retrieval (op); + object = container_of(op->op.object, struct cachefiles_object, fscache);spin_lock (&object->work_lock); -list_add_tail (&monitor->op_link, &monitor->op->to_do); +list_add_tail (&monitor->op_link, &op->to_do);spin_unlock (&object->work_lock); -fscache_enqueue_retrieval (monitor->op); +fscache_enqueue_retrieval (op); +fscache_put_retrieval (op);return 0 ; }
fs/ext4/namei.c +1 -0
@@ -1242,6 +1242,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir,return bh;dxtrace (printk (KERN_DEBUG "ext4_find_entry: dx failed, " "falling back\n" )); + ret =NULL ; } nblocks = dir->i_size >>EXT4_BLOCK_SIZE_BITS (sb);if (!nblocks) {
fs/fscache/operation.c +4 -2
@@ -37,7 +37,8 @@ void fscache_enqueue_operation(struct fscache_operation *op)ASSERT (op->processor !=NULL );ASSERT (fscache_object_is_available (op->object)); ASSERTCMP(atomic_read(&op->usage), >, 0); - ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS); +ASSERTIFCMP (op->state !=FSCACHE_OP_ST_IN_PROGRESS , + op->state, ==, FSCACHE_OP_ST_CANCELLED);fscache_stat (&fscache_n_op_enqueue);switch (op->flags &FSCACHE_OP_TYPE ) {
@@ -401,7 +402,8 @@ void fscache_put_operation(struct fscache_operation *op)struct fscache_cache *cache;_enter ("{OBJ%x OP%x,%d}" , - op->object->debug_id, op->debug_id,atomic_read (&op->usage)); + op->object ? op->object->debug_id :0 , + op->debug_id,atomic_read (&op->usage)); ASSERTCMP(atomic_read(&op->usage), >, 0);
fs/fuse/dev.c +5 -2
@@ -1913,11 +1913,14 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,if (!fc)return -EPERM ; +pipe_lock (pipe); + bufs =kmalloc (pipe->buffers *sizeof (struct pipe_buffer ),GFP_KERNEL ); -if (!bufs) +if (!bufs) { +pipe_unlock (pipe);return -ENOMEM ; + } -pipe_lock (pipe); nbuf =0 ; rem =0 ;for (idx =0 ; idx < pipe->nrbufs && rem < len; idx++)
fs/fuse/file.c +1 -0
@@ -910,6 +910,7 @@ static int fuse_readpages_fill(void *_data, struct page *page) }if (WARN_ON (req->num_pages >= req->max_pages)) { +unlock_page (page);fuse_put_request (fc, req);return -EIO ; }
fs/sysfs/file.c +44 -0
50 lines not on this page · raw message
include/linux/sysfs.h +14 -0
@@ -200,6 +200,9 @@ int __must_check sysfs_create_files(struct kobject *kobj, const struct attribute **attr);int __must_check sysfs_chmod_file (struct kobject *kobj,const struct attribute *attr,umode_t mode); +struct kernfs_node *sysfs_break_active_protection (struct kobject *kobj, +const struct attribute *attr); +void sysfs_unbreak_active_protection (struct kernfs_node *kn);void sysfs_remove_file_ns (struct kobject *kobj,const struct attribute *attr,const void *ns);bool sysfs_remove_file_self (struct kobject *kobj,const struct attribute *attr);
@@ -299,6 +302,17 @@ static inline int sysfs_chmod_file(struct kobject *kobj,return 0 ; } +static inline struct kernfs_node * +sysfs_break_active_protection (struct kobject *kobj, +const struct attribute *attr) +{ +return NULL ; +} + +static inline void sysfs_unbreak_active_protection (struct kernfs_node *kn) +{ +} +static inline void sysfs_remove_file_ns (struct kobject *kobj,const struct attribute *attr,const void *ns)
kernel/kprobes.c +2 -2
@@ -2425,7 +2425,7 @@ static int __init debugfs_kprobe_init(void)if (!dir)return -ENOMEM ; - file =debugfs_create_file ("list" ,0444 , dir,NULL , + file =debugfs_create_file ("list" ,0400 , dir,NULL , &debugfs_kprobes_operations);if (!file) goto error;
@@ -2435,7 +2435,7 @@ static int __init debugfs_kprobe_init(void)if (!file) goto error; - file =debugfs_create_file ("blacklist" ,0444 , dir,NULL , + file =debugfs_create_file ("blacklist" ,0400 , dir,NULL , &debugfs_kprobe_blacklist_ops);if (!file) goto error;
kernel/sysctl.c +2 -1
@@ -341,7 +341,8 @@ static struct ctl_table kern_table[] = { .data = &sysctl_sched_time_avg, .maxlen = sizeof(unsigned int), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, }, { .procname = "sched_shares_window_ns",
mm/memory.c +3 -0
@@ -3522,6 +3522,9 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,return -EINVAL ; maddr =ioremap_prot (phys_addr,PAGE_ALIGN (len + offset), prot); +if (!maddr) +return -ENOMEM ; +if (write)memcpy_toio (maddr + offset, buf, len);else
mm/zswap.c +9 -0
@@ -662,6 +662,15 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset, ret = -ENOMEM ; goto reject; } + +/* A second zswap_is_full() check after +* zswap_shrink() to make sure it's now +* under the max_pool_percent +*/ +if (zswap_is_full ()) { + ret = -ENOMEM ; + goto reject; + } }/* allocate entry */
net/caif/caif_dev.c +3 -1
@@ -131,8 +131,10 @@ static void caif_flow_cb(struct sk_buff *skb) caifd =caif_get (skb->dev);WARN_ON (caifd ==NULL ); -if (caifd ==NULL ) +if (!caifd) { +rcu_read_unlock ();return ; + }caifd_hold (caifd);rcu_read_unlock ();
net/ipv4/cipso_ipv4.c +10 -2
@@ -1591,9 +1591,17 @@ unsigned char *cipso_v4_optptr(const struct sk_buff *skb)int taglen;for (optlen = iph->ihl*4 -sizeof (struct iphdr ); optlen >0 ; ) { -if (optptr[0 ] ==IPOPT_CIPSO ) +switch (optptr[0 ]) { +case IPOPT_CIPSO :return optptr; - taglen = optptr[1 ]; +case IPOPT_END : +return NULL ; +case IPOPT_NOOP : + taglen =1 ; +break ; +default : + taglen = optptr[1 ]; + } optlen -= taglen; optptr += taglen; }
net/mac80211/util.c +2 -1
@@ -1876,7 +1876,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)if (!sta->uploaded)continue ; -if (sta->sdata->vif.type !=NL80211_IFTYPE_AP ) +if (sta->sdata->vif.type !=NL80211_IFTYPE_AP && + sta->sdata->vif.type !=NL80211_IFTYPE_AP_VLAN )continue ; for (state = IEEE80211_STA_NOTEXIST;
net/wireless/nl80211.c +1 -0
@@ -3490,6 +3490,7 @@ static int parse_station_flags(struct genl_info *info, params->sta_flags_mask =BIT (NL80211_STA_FLAG_AUTHENTICATED ) |BIT (NL80211_STA_FLAG_MFP ) |BIT (NL80211_STA_FLAG_AUTHORIZED ); +break ;default :return -EINVAL ; }
net/xfrm/xfrm_policy.c +3 -0
@@ -2291,6 +2291,9 @@ struct dst_entry *xfrm_lookup_route(struct net *net, struct dst_entry *dst_orig,if (IS_ERR (dst) &&PTR_ERR (dst) == -EREMOTE )return make_blackhole (net, dst_orig->ops->family, dst_orig); +if (IS_ERR (dst)) +dst_release (dst_orig); +return dst; }EXPORT_SYMBOL (xfrm_lookup_route);
net/xfrm/xfrm_user.c +6 -4
@@ -955,10 +955,12 @@ static inline int xfrm_nlmsg_multicast(struct net *net, struct sk_buff *skb, {struct sock *nlsk =rcu_dereference (net->xfrm.nlsk); -if (nlsk) -return nlmsg_multicast (nlsk, skb, pid, group,GFP_ATOMIC ); -else -return -1 ; +if (!nlsk) { +kfree_skb (skb); +return -EPIPE ; + } + +return nlmsg_multicast (nlsk, skb, pid, group,GFP_ATOMIC ); }static inline size_t xfrm_spdinfo_msgsize (void )
sound/soc/sirf/sirf-usp.c +3 -4
@@ -367,10 +367,9 @@ static int sirf_usp_pcm_probe(struct platform_device *pdev)platform_set_drvdata (pdev, usp); mem_res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - base =devm_ioremap (&pdev->dev, mem_res->start, -resource_size (mem_res)); -if (base ==NULL ) -return -ENOMEM ; + base =devm_ioremap_resource (&pdev->dev, mem_res); +if (IS_ERR (base)) +return PTR_ERR (base); usp->regmap =devm_regmap_init_mmio (&pdev->dev, base, &sirf_usp_regmap_config);if (IS_ERR (usp->regmap))
tools/power/x86/turbostat/turbostat.c +4 -4
@@ -605,9 +605,7 @@ void format_all_counters(struct thread_data *t, struct core_data *c, struct pkg_if (!printed || !summary_only)print_header (); -if (topo.num_cpus >1 ) -format_counters (&average.threads, &average.cores, - &average.packages); +format_counters (&average.threads, &average.cores, &average.packages); printed =1 ;
@@ -2011,7 +2009,9 @@ void check_cpuid() family = (fms >>8 ) &0xf ; model = (fms >>4 ) &0xf ; stepping = fms &0xf ; -if (family ==6 || family ==0xf ) +if (family ==0xf ) + family += (fms >>20 ) &0xff ; +if (family >=6 ) model += ((fms >>16 ) &0xf ) <<4 ;if (verbose)
tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc new file +28 -0
@@ -0,0 +1,28 @@ +#!/bin/sh +# description: Snapshot and tracing setting +# flags: instance + +[ ! -f snapshot ] && exit_unsupported + +echo "Set tracing off" +echo 0 > tracing_on + +echo "Allocate and take a snapshot" +echo 1 > snapshot + +# Since trace buffer is empty, snapshot is also empty, but allocated +grep -q "Snapshot is allocated" snapshot + +echo "Ensure keep tracing off" +test `cat tracing_on` -eq 0 + +echo "Set tracing on" +echo 1 > tracing_on + +echo "Take a snapshot again" +echo 1 > snapshot + +echo "Ensure keep tracing on" +test `cat tracing_on` -eq 1 + +exit 0
tools/usb/ffs-test.c +16 -3
@@ -44,12 +44,25 @@/******************** Little Endian Handling ********************************/ -#define cpu_to_le16 (x) htole16(x) -#define cpu_to_le32 (x) htole32(x) +/* +* cpu_to_le16/32 are used when initializing structures, a context where a +* function call is not allowed. To solve this, we code cpu_to_le16/32 in a way +* that allows them to be used when initializing structures. +*/ + +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define cpu_to_le16 (x) (x) +#define cpu_to_le32 (x) (x) +#else +#define cpu_to_le16 (x) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) +#define cpu_to_le32 (x) \ + ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \ + (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) +#endif +#define le32_to_cpu (x) le32toh(x)#define le16_to_cpu (x) le16toh(x) -/******************** Messages and Errors ***********************************/ static const char argv0[] ="ffs-test" ;