3.4.104-rc1 review
Subsystems (2)
cover 3.4.104-rc1 review
From: Zefan Li <[email protected]>
This is the start of the stable review cycle for the 3.4.104 release. There are 45 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Sep 25 02:03:31 UTC 2014. Anything received after that time might be too late.
A combined patch relative to 3.4.103 will be posted as an additional response to this. A shortlog and diffstat can be found below.
thanks,
Zefan Li
--------------------
Aaro Koskinen (1):
MIPS: OCTEON: make get_system_type() thread-safe
Alan Douglas (1):
xtensa: fix address checks in dma_{alloc,free}_coherent
Andi Kleen (1):
slab/mempolicy: always use local policy from interrupt context
Anton Blanchard (1):
ibmveth: Fix endian issues with rx_no_buffer statistic
Arjun Sreedharan (1):
pata_scc: propagate return value of scc_wait_after_reset
Benjamin Tissoires (1):
HID: logitech-dj: prevent false errors to be shown
Brennan Ashton (1):
USB: option: add VIA Telecom CDS7 chipset device id
Daniel Mack (1):
ASoC: pxa-ssp: drop SNDRV_PCM_FMTBIT_S24_LE
Dave Chiluk (1):
stable_kernel_rules: Add pointer to netdev-FAQ for network patches
Fengguang Wu (1):
unicore32: select generic atomic64_t support
Florian Fainelli (1):
MIPS: perf: Fix build error caused by unused
counters_per_cpu_to_total()
Greg KH (1):
USB: serial: pl2303: add device id for ztek device
Guan Xuetao (2):
UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference
between native and cross compiler
UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer
Hans de Goede (1):
xhci: Treat not finding the event_seg on COMP_STOP the same as
COMP_STOP_INVAL
Huang Rui (1):
usb: xhci: amd chipset also needs short TX quirk
James Forshaw (1):
USB: whiteheat: Added bounds checking for bulk command response
Jan Kara (2):
isofs: Fix unbounded recursion when processing relocated directories
ext2: Fix fs corruption in ext2_get_xip_mem()
Jaša Bartelj (1):
USB: ftdi_sio: Added PID for new ekey device
Jiri Kosina (4):
HID: fix a couple of off-by-ones
HID: logitech: perform bounds checking on device_id early enough
HID: magicmouse: sanity check report size in raw_event() callback
HID: picolcd: sanity check report size in raw_event() callback
Joerg Roedel (1):
iommu/amd: Fix cleanup_domain for mass device removal
Johan Hovold (3):
USB: ftdi_sio: add Basic Micro ATOM Nano USB2Serial PID
USB: serial: fix potential stack buffer overflow
USB: serial: fix potential heap buffer overflow
Mark Einon (1):
staging: et131x: Fix errors caused by phydev->addr accesses before
initialisation
Mark Rutland (2):
ARM: 8128/1: abort: don't clear the exclusive monitors
ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using
dummy strex
Max Filippov (3):
xtensa: replace IOCTL code definitions with constants
xtensa: fix TLBTEMP_BASE_2 region handling in fast_second_level_miss
xtensa: fix a6 and a7 handling in fast_syscall_xtensa
Michael Cree (2):
alpha: Fix fall-out from disintegrating asm/system.h
alpha: add io{read,write}{16,32}be functions
Michael S. Tsirkin (1):
kvm: iommu: fix the third parameter of kvm_iommu_put_pages
(CVE-2014-3601)
NeilBrown (1):
md/raid6: avoid data corruption during recovery of double-degraded
RAID6
Paul Gortmaker (1):
8250_pci: fix warnings in backport of Broadcom TruManage support
Pavel Shilovsky (1):
CIFS: Fix wrong directory attributes after rename
Ralf Baechle (1):
MIPS: Fix accessing to per-cpu data when flushing the cache
Stefan Kristiansson (1):
openrisc: add missing header inclusion
Stephen Hemminger (1):
USB: sisusb: add device id for Magic Control USB video
Takashi Iwai (1):
ALSA: hda/realtek - Avoid setting wrong COEF on ALC269 & co
Trond Myklebust (1):
NFSv4: Fix problems with close in the presence of a delegation
Documentation/stable_kernel_rules.txt | 3 ++ arch/alpha/include/asm/io.h | 5 +++ arch/alpha/oprofile/common.c | 1 + arch/arm/kernel/entry-header.S | 29 ++++++------ arch/arm/mm/abort-ev6.S | 6 --- arch/arm/mm/abort-ev7.S | 6 --- arch/mips/cavium-octeon/setup.c | 18 +++++--- arch/mips/kernel/perf_event_mipsxx.c | 5 --- arch/mips/mm/c-r4k.c | 5 +++ arch/openrisc/kernel/head.S | 1 + arch/unicore32/Kconfig | 1 + arch/unicore32/include/asm/bug.h | 5 --- arch/unicore32/include/asm/cmpxchg.h | 2 +- arch/unicore32/kernel/setup.h | 6 +++ arch/xtensa/include/asm/ioctls.h | 19 ++++---- arch/xtensa/include/asm/pgtable.h | 7 ++- arch/xtensa/kernel/entry.S | 14 +++--- arch/xtensa/kernel/pci-dma.c | 12 ++--- drivers/ata/pata_scc.c | 15 +++---- drivers/hid/hid-cherry.c | 2 +- drivers/hid/hid-kye.c | 2 +- drivers/hid/hid-lg.c | 4 +- drivers/hid/hid-logitech-dj.c | 54 +++++++++++++---------- drivers/hid/hid-logitech-dj.h | 1 + drivers/hid/hid-magicmouse.c | 10 +++++ drivers/hid/hid-monterey.c | 2 +- drivers/hid/hid-petalynx.c | 2 +- drivers/hid/hid-picolcd.c | 6 +++ drivers/hid/hid-sunplus.c | 2 +- drivers/iommu/amd_iommu.c | 10 +++-- drivers/md/raid5.c | 2 + drivers/net/ethernet/ibm/ibmveth.c | 18 ++++++-- drivers/staging/et131x/et131x.c | 78 ++++++++++++++------------------- drivers/tty/serial/8250/8250_pci.c | 6 +-- drivers/usb/host/xhci-pci.c | 4 ++ drivers/usb/host/xhci-ring.c | 3 +- drivers/usb/misc/sisusbvga/sisusb.c | 1 + drivers/usb/serial/ftdi_sio.c | 3 ++ drivers/usb/serial/ftdi_sio_ids.h | 7 +++ drivers/usb/serial/option.c | 5 +++ drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/usb-serial.c | 35 ++++++++++----- drivers/usb/serial/whiteheat.c | 7 ++- fs/cifs/inode.c | 6 +++ fs/ext2/inode.c | 2 + fs/ext2/xip.c | 1 + fs/isofs/inode.c | 15 ++++--- fs/isofs/isofs.h | 23 ++++++++-- fs/isofs/rock.c | 39 ++++++++++++----- fs/nfs/nfs4proc.c | 17 ++++--- include/linux/mempolicy.h | 2 +- mm/mempolicy.c | 8 +++- mm/slab.c | 4 +- mm/slub.c | 2 +- sound/pci/hda/patch_realtek.c | 17 ++++--- sound/soc/pxa/pxa-ssp.c | 4 +- virt/kvm/iommu.c | 19 ++++---- 58 files changed, 364 insertions(+), 221 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/45 stable_kernel_rules: Add pointer to netdev-FAQ for network patches
From: Dave Chiluk <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit b76fc285337b6b256e9ba20a40cfd043f70c27af upstream.
Stable_kernel_rules should point submitters of network stable patches to the netdev_FAQ.txt as requests for stable network patches should go to netdev first.
--- Documentation/stable_kernel_rules.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/stable_kernel_rules.txt +3 -0
@@ -29,6 +29,9 @@ Rules on what kind of patches are accepted, and which ones are not, into the Procedure for submitting patches to the -stable tree: + - If the patch covers files in net/ or drivers/net please follow netdev stable + submission guidelines as described in + Documentation/networking/netdev-FAQ.txt - Send the patch, after verifying that it follows the above rules, to [email protected]. You must note the upstream commit ID in the changelog of your submission, as well as the kernel version you wish
Signature · 1 line
1.7.9.5
PATCH 2/45 ASoC: pxa-ssp: drop SNDRV_PCM_FMTBIT_S24_LE
In reply to Zefan LiFrom: Daniel Mack <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 9301503af016eb537ccce76adec0c1bb5c84871e upstream.
This mode is unsupported, as the DMA controller can't do zero-padding of samples.
--- sound/soc/pxa/pxa-ssp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/pxa/pxa-ssp.c +1 -3
@@ -779,9 +779,7 @@ static int pxa_ssp_remove(struct snd_soc_dai *dai) SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | \ SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) -#define PXA_SSP_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ - SNDRV_PCM_FMTBIT_S24_LE | \ - SNDRV_PCM_FMTBIT_S32_LE) +#define PXA_SSP_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)static const struct snd_soc_dai_ops pxa_ssp_dai_ops = { .startup = pxa_ssp_startup,
Signature · 1 line
1.7.9.5
PATCH 3/45 ibmveth: Fix endian issues with rx_no_buffer statistic
In reply to Zefan LiFrom: Anton Blanchard <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit cbd5228199d8be45d895d9d0cc2b8ce53835fc21 upstream.
Hidden away in the last 8 bytes of the buffer_list page is a solitary statistic. It needs to be byte swapped or else ethtool -S will produce numbers that terrify the user.
Since we do this in multiple places, create a helper function with a comment explaining what is going on.
--- drivers/net/ethernet/ibm/ibmveth.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/net/ethernet/ibm/ibmveth.c +14 -4
@@ -293,6 +293,18 @@ failure:atomic_add (buffers_added, &(pool->available)); } +/* +* The final 8 bytes of the buffer list is a counter of frames dropped +* because there was not a buffer in the buffer list capable of holding +* the frame. +*/ +static void ibmveth_update_rx_no_buffer (struct ibmveth_adapter *adapter) +{ +__be64 *p = adapter->buffer_list_addr +4096 -8 ; + + adapter->rx_no_buffer =be64_to_cpup (p); +} +/* replenish routine */ static void ibmveth_replenish_task (struct ibmveth_adapter *adapter) {
@@ -308,8 +320,7 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter)ibmveth_replenish_buffer_pool (adapter, pool); } - adapter->rx_no_buffer = *(u64 *)(((char *)adapter->buffer_list_addr) + -4096 -8 ); +ibmveth_update_rx_no_buffer (adapter); }/* empty and free ana buffer pool - also used to do cleanup in error paths */
@@ -692,8 +703,7 @@ static int ibmveth_close(struct net_device *netdev)free_irq (netdev->irq, netdev); - adapter->rx_no_buffer = *(u64 *)(((char *)adapter->buffer_list_addr) + -4096 -8 ); +ibmveth_update_rx_no_buffer (adapter);ibmveth_cleanup (adapter);
Signature · 1 line
1.7.9.5
PATCH 4/45 HID: fix a couple of off-by-ones
In reply to Zefan LiFrom: Jiri Kosina <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 4ab25786c87eb20857bbb715c3ae34ec8fd6a214 upstream.
There are a few very theoretical off-by-one bugs in report descriptor size checking when performing a pre-parsing fixup. Fix those.
--- drivers/hid/hid-cherry.c | 2 +- drivers/hid/hid-kye.c | 2 +- drivers/hid/hid-lg.c | 4 ++-- drivers/hid/hid-monterey.c | 2 +- drivers/hid/hid-petalynx.c | 2 +- drivers/hid/hid-sunplus.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
drivers/hid/hid-cherry.c +1 -1
@@ -29,7 +29,7 @@static __u8 *ch_report_fixup (struct hid_device *hdev,__u8 *rdesc,unsigned int *rsize) { -if (*rsize >=17 && rdesc[11 ] ==0x3c && rdesc[12 ] ==0x02 ) { +if (*rsize >=18 && rdesc[11 ] ==0x3c && rdesc[12 ] ==0x02 ) {hid_info (hdev,"fixing up Cherry Cymotion report descriptor\n" ); rdesc[11 ] = rdesc[16 ] =0xff ; rdesc[12 ] = rdesc[17 ] =0x03 ;
drivers/hid/hid-kye.c +1 -1
@@ -282,7 +282,7 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,* - change the button usage range to 4-7 for the extra * buttons */ - if (*rsize >= 74 && + if (*rsize >= 75 && rdesc[61] == 0x05 && rdesc[62] == 0x08 && rdesc[63] == 0x19 && rdesc[64] == 0x08 && rdesc[65] == 0x29 && rdesc[66] == 0x0f &&
drivers/hid/hid-lg.c +2 -2
@@ -111,7 +111,7 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc, {unsigned long quirks = (unsigned long )hid_get_drvdata (hdev); -if ((quirks &LG_RDESC ) && *rsize >=90 && rdesc[83 ] ==0x26 && +if ((quirks &LG_RDESC ) && *rsize >=91 && rdesc[83 ] ==0x26 && rdesc[84 ] ==0x8c && rdesc[85 ] ==0x02 ) {hid_info (hdev,"fixing up Logitech keyboard report descriptor\n" );
@@ -120,7 +120,7 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc, }if ((quirks &LG_RDESC_REL_ABS ) && *rsize >=50 && rdesc[32 ] ==0x81 && rdesc[33 ] ==0x06 && - rdesc[49 ] ==0x81 && rdesc[50 ] ==0x06 ) { + rdesc[49 ] ==0x81 && rdesc[51 ] ==0x06 ) {hid_info (hdev,"fixing up rel/abs in Logitech report descriptor\n" ); rdesc[33 ] = rdesc[50 ] =0x02 ;
drivers/hid/hid-monterey.c +1 -1
@@ -25,7 +25,7 @@static __u8 *mr_report_fixup (struct hid_device *hdev,__u8 *rdesc,unsigned int *rsize) { -if (*rsize >=30 && rdesc[29 ] ==0x05 && rdesc[30 ] ==0x09 ) { +if (*rsize >=31 && rdesc[29 ] ==0x05 && rdesc[30 ] ==0x09 ) {hid_info (hdev,"fixing up button/consumer in HID report descriptor\n" ); rdesc[30 ] =0x0c ; }
drivers/hid/hid-petalynx.c +1 -1
@@ -26,7 +26,7 @@static __u8 *pl_report_fixup (struct hid_device *hdev,__u8 *rdesc,unsigned int *rsize) { -if (*rsize >=60 && rdesc[39 ] ==0x2a && rdesc[40 ] ==0xf5 && +if (*rsize >=62 && rdesc[39 ] ==0x2a && rdesc[40 ] ==0xf5 && rdesc[41 ] ==0x00 && rdesc[59 ] ==0x26 && rdesc[60 ] ==0xf9 && rdesc[61 ] ==0x00 ) {hid_info (hdev,"fixing up Petalynx Maxter Remote report descriptor\n" );
drivers/hid/hid-sunplus.c +1 -1
@@ -25,7 +25,7 @@static __u8 *sp_report_fixup (struct hid_device *hdev,__u8 *rdesc,unsigned int *rsize) { -if (*rsize >=107 && rdesc[104 ] ==0x26 && rdesc[105 ] ==0x80 && +if (*rsize >=112 && rdesc[104 ] ==0x26 && rdesc[105 ] ==0x80 && rdesc[106 ] ==0x03 ) {hid_info (hdev,"fixing up Sunplus Wireless Desktop report descriptor\n" ); rdesc[105 ] = rdesc[110 ] =0x03 ;
Signature · 1 line
1.7.9.5
PATCH 5/45 HID: logitech: perform bounds checking on device_id early enough
In reply to Zefan LiFrom: Jiri Kosina <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit ad3e14d7c5268c2e24477c6ef54bbdf88add5d36 upstream.
device_index is a char type and the size of paired_dj_deivces is 7 elements, therefore proper bounds checking has to be applied to device_index before it is used.
We are currently performing the bounds checking in logi_dj_recv_add_djhid_device(), which is too late, as malicious device could send REPORT_TYPE_NOTIF_DEVICE_UNPAIRED early enough and trigger the problem in one of the report forwarding functions called from logi_dj_raw_event().
Fix this by performing the check at the earliest possible ocasion in logi_dj_raw_event().
--- drivers/hid/hid-logitech-dj.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/hid/hid-logitech-dj.c +6 -7
@@ -230,13 +230,6 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,return ; } -if ((dj_report->device_index <DJ_DEVICE_INDEX_MIN ) || - (dj_report->device_index >DJ_DEVICE_INDEX_MAX )) { -dev_err (&djrcv_hdev->dev,"%s: invalid device index:%d\n" , - __func__, dj_report->device_index); -return ; - } -if (djrcv_dev->paired_dj_devices[dj_report->device_index]) {/* The device is already known. No need to reallocate it. */ dbg_hid ("%s: device is already known\n" , __func__);
@@ -715,6 +708,12 @@ static int logi_dj_raw_event(struct hid_device *hdev,* device (via hid_input_report() ) and return 1 so hid-core does not do * anything else with it. */ +if ((dj_report->device_index <DJ_DEVICE_INDEX_MIN ) || + (dj_report->device_index >DJ_DEVICE_INDEX_MAX )) { +dev_err (&hdev->dev,"%s: invalid device index:%d\n" , + __func__, dj_report->device_index); +return false; + }spin_lock_irqsave (&djrcv_dev->lock, flags);if (dj_report->report_id ==REPORT_ID_DJ_SHORT ) {
Signature · 1 line
1.7.9.5
PATCH 6/45 isofs: Fix unbounded recursion when processing relocated directories
In reply to Zefan LiFrom: Jan Kara <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 410dd3cf4c9b36f27ed4542ee18b1af5e68645a4 upstream.
We did not check relocated directory in any way when processing Rock Ridge 'CL' tag. Thus a corrupted isofs image can possibly have a CL entry pointing to another CL entry leading to possibly unbounded recursion in kernel code and thus stack overflow or deadlocks (if there is a loop created from CL entries).
Fix the problem by not allowing CL entry to point to a directory entry with CL entry (such use makes no good sense anyway) and by checking whether CL entry doesn't point to itself.
--- fs/isofs/inode.c | 15 ++++++++------- fs/isofs/isofs.h | 23 +++++++++++++++++++---- fs/isofs/rock.c | 39 ++++++++++++++++++++++++++++----------- 3 files changed, 55 insertions(+), 22 deletions(-)
fs/isofs/inode.c +8 -7
@@ -68,7 +68,7 @@ static void isofs_put_super(struct super_block *sb)return ; } -static int isofs_read_inode (struct inode *); +static int isofs_read_inode (struct inode *,int relocated);static int isofs_statfs (struct dentry *,struct kstatfs *);static struct kmem_cache *isofs_inode_cachep;
@@ -1264,7 +1264,7 @@ out_toomany: goto out; } -static int isofs_read_inode (struct inode *inode) +static int isofs_read_inode (struct inode *inode,int relocated) {struct super_block *sb = inode->i_sb;struct isofs_sb_info *sbi =ISOFS_SB (sb);
@@ -1409,7 +1409,7 @@ static int isofs_read_inode(struct inode *inode)*/ if (!high_sierra) { -parse_rock_ridge_inode (de, inode); +parse_rock_ridge_inode (de, inode, relocated);/* if we want uid/gid set, override the rock ridge setting */ if (sbi->s_uid_set) inode->i_uid = sbi->s_uid;
@@ -1488,9 +1488,10 @@ static int isofs_iget5_set(struct inode *ino, void *data)* offset that point to the underlying meta-data for the inode. The * code below is otherwise similar to the iget() code in * include/linux/fs.h */ -struct inode *isofs_iget (struct super_block *sb, -unsigned long block, -unsigned long offset) +struct inode *__isofs_iget (struct super_block *sb, +unsigned long block, +unsigned long offset, +int relocated) {unsigned long hashval;struct inode *inode;
@@ -1512,7 +1513,7 @@ struct inode *isofs_iget(struct super_block *sb,return ERR_PTR (-ENOMEM );if (inode->i_state &I_NEW ) { - ret =isofs_read_inode (inode); + ret =isofs_read_inode (inode, relocated);if (ret <0 ) {iget_failed (inode); inode =ERR_PTR (ret);
fs/isofs/isofs.h +19 -4
@@ -107,7 +107,7 @@ extern int iso_date(char *, int);struct inode ;/* To make gcc happy */ -extern int parse_rock_ridge_inode (struct iso_directory_record *,struct inode *); +extern int parse_rock_ridge_inode (struct iso_directory_record *,struct inode *,int relocated);extern int get_rock_ridge_filename (struct iso_directory_record *,char *,struct inode *);extern int isofs_name_translate (struct iso_directory_record *,char *,struct inode *);
@@ -118,9 +118,24 @@ extern struct dentry *isofs_lookup(struct inode *, struct dentry *, struct nameiextern struct buffer_head *isofs_bread (struct inode *,sector_t );extern int isofs_get_blocks (struct inode *,sector_t ,struct buffer_head **,unsigned long ); -extern struct inode *isofs_iget (struct super_block *sb, -unsigned long block, -unsigned long offset); +struct inode *__isofs_iget (struct super_block *sb, +unsigned long block, +unsigned long offset, +int relocated); + +static inline struct inode *isofs_iget (struct super_block *sb, +unsigned long block, +unsigned long offset) +{ +return __isofs_iget (sb, block, offset,0 ); +} + +static inline struct inode *isofs_iget_reloc (struct super_block *sb, +unsigned long block, +unsigned long offset) +{ +return __isofs_iget (sb, block, offset,1 ); +}/* Because the inode number is no longer relevant to finding the * underlying meta-data for an inode, we are free to choose a more
fs/isofs/rock.c +28 -11
@@ -288,12 +288,16 @@ eio: goto out; } +#define RR_REGARD_XA 1 +#define RR_RELOC_DE 2 +static int parse_rock_ridge_inode_internal (struct iso_directory_record *de, -struct inode *inode,int regard_xa) +struct inode *inode,int flags) {int symlink_len =0 ;int cnt, sig; +unsigned int reloc_block;struct inode *reloc;struct rock_ridge *rr;int rootflag;
@@ -305,7 +309,7 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de,init_rock_state (&rs, inode);setup_rock_ridge (de, inode, &rs); -if (regard_xa) { +if (flags &RR_REGARD_XA ) { rs.chr +=14 ; rs.len -=14 ;if (rs.len <0 )
@@ -485,12 +489,22 @@ repeat: "relocated directory\n"); goto out;case SIG ('C' ,'L' ): -ISOFS_I (inode)->i_first_extent = -isonum_733 (rr->u.CL.location); - reloc = -isofs_iget (inode->i_sb, -ISOFS_I (inode)->i_first_extent, -0 ); +if (flags &RR_RELOC_DE ) { +printk (KERN_ERR +"ISOFS: Recursive directory relocation " +"is not supported\n" ); + goto eio; + } + reloc_block =isonum_733 (rr->u.CL.location); +if (reloc_block ==ISOFS_I (inode)->i_iget5_block && +ISOFS_I (inode)->i_iget5_offset ==0 ) { +printk (KERN_ERR +"ISOFS: Directory relocation points to " +"itself\n" ); + goto eio; + } +ISOFS_I (inode)->i_first_extent = reloc_block; + reloc =isofs_iget_reloc (inode->i_sb, reloc_block,0 );if (IS_ERR (reloc)) { ret =PTR_ERR (reloc); goto out;
@@ -637,9 +651,11 @@ static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)return rpnt; } -int parse_rock_ridge_inode (struct iso_directory_record *de,struct inode *inode) +int parse_rock_ridge_inode (struct iso_directory_record *de,struct inode *inode, +int relocated) { -int result =parse_rock_ridge_inode_internal (de, inode,0 ); +int flags = relocated ?RR_RELOC_DE :0 ; +int result =parse_rock_ridge_inode_internal (de, inode, flags);/* * if rockridge flag was reset and we didn't look for attributes
@@ -647,7 +663,8 @@ int parse_rock_ridge_inode(struct iso_directory_record *de, struct inode *inode)*/ if ((ISOFS_SB (inode->i_sb)->s_rock_offset ==-1 ) && (ISOFS_SB (inode->i_sb)->s_rock ==2 )) { - result =parse_rock_ridge_inode_internal (de, inode,14 ); + result =parse_rock_ridge_inode_internal (de, inode, + flags |RR_REGARD_XA ); }return result; }
Signature · 1 line
1.7.9.5
PATCH 7/45 MIPS: OCTEON: make get_system_type() thread-safe
In reply to Zefan LiFrom: Aaro Koskinen <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 608308682addfdc7b8e2aee88f0e028331d88e4d upstream.
get_system_type() is not thread-safe on OCTEON. It uses static data, also more dangerous issue is that it's calling cvmx_fuse_read_byte() every time without any synchronization. Currently it's possible to get processes stuck looping forever in kernel simply by launching multiple readers of /proc/cpuinfo:
(while true; do cat /proc/cpuinfo > /dev/null; done) & (while true; do cat /proc/cpuinfo > /dev/null; done) &
...
Fix by initializing the system type string only once during the early boot.
Patchwork: http://patchwork.linux-mips.org/patch/7437/
--- arch/mips/cavium-octeon/setup.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
arch/mips/cavium-octeon/setup.c +13 -5
@@ -265,6 +265,18 @@ static irqreturn_t octeon_rlm_interrupt(int cpl, void *dev_id) }#endif +static char __read_mostly octeon_system_type[80 ]; + +static int __init init_octeon_system_type (void ) +{ +snprintf (octeon_system_type,sizeof (octeon_system_type),"%s (%s)" , +cvmx_board_type_to_string (octeon_bootinfo->board_type), +octeon_model_get_string (read_c0_prid ())); + +return 0 ; +} +early_initcall (init_octeon_system_type); +/** * Return a string representing the system type *
@@ -272,11 +284,7 @@ static irqreturn_t octeon_rlm_interrupt(int cpl, void *dev_id)*/ const char *octeon_board_type_string (void ) { -static char name[80 ]; -sprintf (name,"%s (%s)" , -cvmx_board_type_to_string (octeon_bootinfo->board_type), -octeon_model_get_string (read_c0_prid ())); -return name; +return octeon_system_type; }const char *get_system_type (void )
Signature · 1 line
1.7.9.5
PATCH 8/45 kvm: iommu: fix the third parameter of kvm_iommu_put_pages (CVE-2014-3601)
In reply to Zefan LiFrom: "Michael S. Tsirkin" <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 350b8bdd689cd2ab2c67c8a86a0be86cfa0751a7 upstream.
The third parameter of kvm_iommu_put_pages is wrong, It should be 'gfn - slot->base_gfn'.
By making gfn very large, malicious guest or userspace can cause kvm to go to this error path, and subsequently to pass a huge value as size. Alternatively if gfn is small, then pages would be pinned but never unpinned, causing host memory leak and local DOS.
Passing a reasonable but large value could be the most dangerous case, because it would unpin a page that should have stayed pinned, and thus allow the device to DMA into arbitrary memory. However, this cannot happen because of the condition that can trigger the error:
- out of memory (where you can't allocate even a single page) should not be possible for the attacker to trigger
- when exceeding the iommu's address space, guest pages after gfn will also exceed the iommu's address space, and inside kvm_iommu_put_pages() the iommu_iova_to_phys() will fail. The page thus would not be unpinned at all.
--- virt/kvm/iommu.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
virt/kvm/iommu.c +10 -9
@@ -61,6 +61,14 @@ static pfn_t kvm_pin_pages(struct kvm *kvm, struct kvm_memory_slot *slot,return pfn; } +static void kvm_unpin_pages (struct kvm *kvm,pfn_t pfn,unsigned long npages) +{ +unsigned long i; + +for (i =0 ; i < npages; ++i) +kvm_release_pfn_clean (pfn + i); +} +int kvm_iommu_map_pages (struct kvm *kvm,struct kvm_memory_slot *slot) {gfn_t gfn, end_gfn;
@@ -121,6 +129,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)if (r) {printk (KERN_ERR "kvm_iommu_map_address:" "iommu failed to map pfn=%llx\n" , pfn); +kvm_unpin_pages (kvm, pfn, page_size); goto unmap_pages; }
@@ -132,7 +141,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)return 0 ; unmap_pages: -kvm_iommu_put_pages (kvm, slot->base_gfn, gfn); +kvm_iommu_put_pages (kvm, slot->base_gfn, gfn - slot->base_gfn);return r; }
@@ -274,14 +283,6 @@ out_unlock:return r; } -static void kvm_unpin_pages (struct kvm *kvm,pfn_t pfn,unsigned long npages) -{ -unsigned long i; - -for (i =0 ; i < npages; ++i) -kvm_release_pfn_clean (pfn + i); -} -static void kvm_iommu_put_pages (struct kvm *kvm,gfn_t base_gfn,unsigned long npages) {
Signature · 1 line
1.7.9.5
PATCH 9/45 pata_scc: propagate return value of scc_wait_after_reset
In reply to Zefan LiFrom: Arjun Sreedharan <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 4dc7c76cd500fa78c64adfda4b070b870a2b993c upstream.
scc_bus_softreset not necessarily should return zero. Propagate the error code.
--- drivers/ata/pata_scc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/ata/pata_scc.c +7 -8
@@ -586,7 +586,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask,* Note: Original code is ata_bus_softreset(). */ -static unsigned int scc_bus_softreset (struct ata_port *ap,unsigned int devmask, +static int scc_bus_softreset (struct ata_port *ap,unsigned int devmask,unsigned long deadline) {struct ata_ioports *ioaddr = &ap->ioaddr;
@@ -600,9 +600,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask,udelay (20 );out_be32 (ioaddr->ctl_addr, ap->ctl); -scc_wait_after_reset (&ap->link, devmask, deadline); - -return 0 ; +return scc_wait_after_reset (&ap->link, devmask, deadline); }/**
@@ -619,7 +617,8 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes, {struct ata_port *ap = link->ap;unsigned int slave_possible = ap->flags &ATA_FLAG_SLAVE_POSS ; -unsigned int devmask =0 , err_mask; +unsigned int devmask =0 ; +int rc;u8 err;DPRINTK ("ENTER\n" );
@@ -635,9 +634,9 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes,/* issue bus reset */ DPRINTK ("about to softreset, devmask=%x\n" , devmask); - err_mask =scc_bus_softreset (ap, devmask, deadline); -if (err_mask) { -ata_port_err (ap,"SRST failed (err_mask=0x%x)\n" , err_mask); + rc =scc_bus_softreset (ap, devmask, deadline); +if (rc) { +ata_port_err (ap,"SRST failed (err_mask=0x%x)\n" , rc);return -EIO ; }
Signature · 1 line
1.7.9.5
PATCH 10/45 iommu/amd: Fix cleanup_domain for mass device removal
In reply to Zefan LiFrom: Joerg Roedel <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 9b29d3c6510407d91786c1cf9183ff4debb3473a upstream.
When multiple devices are detached in __detach_device, they are also removed from the domains dev_list. This makes it unsafe to use list_for_each_entry_safe, as the next pointer might also not be in the list anymore after __detach_device returns. So just repeatedly remove the first element of the list until it is empty.
--- drivers/iommu/amd_iommu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/iommu/amd_iommu.c +6 -4
@@ -3028,14 +3028,16 @@ free_domains:static void cleanup_domain (struct protection_domain *domain) { -struct iommu_dev_data *dev_data, *next; +struct iommu_dev_data *entry;unsigned long flags;write_lock_irqsave (&amd_iommu_devtable_lock, flags); -list_for_each_entry_safe (dev_data, next, &domain->dev_list, list) { -__detach_device (dev_data); -atomic_set (&dev_data->bind,0 ); +while (!list_empty (&domain->dev_list)) { + entry =list_first_entry (&domain->dev_list, + struct iommu_dev_data, list); +__detach_device (entry); +atomic_set (&entry->bind,0 ); }write_unlock_irqrestore (&amd_iommu_devtable_lock, flags);
Signature · 1 line
1.7.9.5
PATCH 11/45 md/raid6: avoid data corruption during recovery of double-degraded RAID6
In reply to Zefan LiFrom: NeilBrown <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 9c4bdf697c39805078392d5ddbbba5ae5680e0dd upstream.
During recovery of a double-degraded RAID6 it is possible for some blocks not to be recovered properly, leading to corruption.
If a write happens to one block in a stripe that would be written to a missing device, and at the same time that stripe is recovering data to the other missing device, then that recovered data may not be written.
This patch skips, in the double-degraded case, an optimisation that is only safe for single-degraded arrays.
Bug was introduced in 2.6.32 and fix is suitable for any kernel since then. In an older kernel with separate handle_stripe5() and handle_stripe6() functions the patch must change handle_stripe6().
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1090423
--- drivers/md/raid5.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/md/raid5.c +2 -0
@@ -3433,6 +3433,8 @@ static void handle_stripe(struct stripe_head *sh)set_bit (R5_Wantwrite, &dev->flags);if (prexor)continue ; +if (s.failed >1 ) +continue ;if (!test_bit (R5_Insync, &dev->flags) || ((i == sh->pd_idx || i == sh->qd_idx) && s.failed ==0 ))
Signature · 1 line
1.7.9.5
PATCH 12/45 CIFS: Fix wrong directory attributes after rename
In reply to Zefan LiFrom: Pavel Shilovsky <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit b46799a8f28c43c5264ac8d8ffa28b311b557e03 upstream.
When we requests rename we also need to update attributes of both source and target parent directories. Not doing it causes generic/309 xfstest to fail on SMB2 mounts. Fix this by marking these directories for force revalidating.
--- fs/cifs/inode.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/cifs/inode.c +6 -0
@@ -1653,6 +1653,12 @@ unlink_target: target_dentry, toName); } +/* force revalidate to go get info when needed */ +CIFS_I (source_dir)->time =CIFS_I (target_dir)->time =0 ; + + source_dir->i_ctime = source_dir->i_mtime = target_dir->i_ctime = + target_dir->i_mtime =current_fs_time (source_dir->i_sb); + cifs_rename_exit:kfree (info_buf_source);kfree (fromName);
Signature · 1 line
1.7.9.5
PATCH 13/45 ALSA: hda/realtek - Avoid setting wrong COEF on ALC269 & co
In reply to Zefan LiFrom: Takashi Iwai <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit f3ee07d8b6e061bf34a7167c3f564e8da4360a99 upstream.
ALC269 & co have many vendor-specific setups with COEF verbs. However, some verbs seem specific to some codec versions and they result in the codec stalling. Typically, such a case can be avoided by checking the return value from reading a COEF. If the return value is -1, it implies that the COEF is invalid, thus it shouldn't be written.
This patch adds the invalid COEF checks in appropriate places accessing ALC269 and its variants. The patch actually fixes the resume problem on Acer AO725 laptop.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=52181
--- sound/pci/hda/patch_realtek.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
sound/pci/hda/patch_realtek.c +12 -5
@@ -458,6 +458,8 @@ static void alc_fix_pll(struct hda_codec *codec) spec->pll_coef_idx); val =snd_hda_codec_read (codec, spec->pll_nid,0 ,AC_VERB_GET_PROC_COEF ,0 ); +if (val ==-1 ) +return ;snd_hda_codec_write (codec, spec->pll_nid,0 ,AC_VERB_SET_COEF_INDEX , spec->pll_coef_idx); snd_hda_codec_write(codec, spec->pll_nid, 0, AC_VERB_SET_PROC_COEF,
@@ -5843,6 +5845,8 @@ static int alc269_parse_auto_config(struct hda_codec *codec)static void alc269_toggle_power_output (struct hda_codec *codec,int power_up) {int val =alc_read_coef_idx (codec,0x04 ); +if (val ==-1 ) +return ;if (power_up) val |=1 <<11 ;else
@@ -6273,27 +6277,30 @@ static void alc269_fill_coef(struct hda_codec *codec)if ((alc_get_coef0 (codec) &0x00ff ) ==0x017 ) { val =alc_read_coef_idx (codec,0x04 );/* Power up output pin */ -alc_write_coef_idx (codec,0x04 , val | (1 <<11 )); +if (val !=-1 ) +alc_write_coef_idx (codec,0x04 , val | (1 <<11 )); }if ((alc_get_coef0 (codec) &0x00ff ) ==0x018 ) { val =alc_read_coef_idx (codec,0xd ); -if ((val &0x0c00 ) >>10 !=0x1 ) { +if (val !=-1 && (val &0x0c00 ) >>10 !=0x1 ) {/* Capless ramp up clock control */ alc_write_coef_idx (codec,0xd , val | (1 <<10 )); } val =alc_read_coef_idx (codec,0x17 ); -if ((val &0x01c0 ) >>6 !=0x4 ) { +if (val !=-1 && (val &0x01c0 ) >>6 !=0x4 ) {/* Class D power on reset */ alc_write_coef_idx (codec,0x17 , val | (1 <<7 )); } } val =alc_read_coef_idx (codec,0xd );/* Class D */ -alc_write_coef_idx (codec,0xd , val | (1 <<14 )); +if (val !=-1 ) +alc_write_coef_idx (codec,0xd , val | (1 <<14 )); val =alc_read_coef_idx (codec,0x4 );/* HP */ -alc_write_coef_idx (codec,0x4 , val | (1 <<11 )); +if (val !=-1 ) +alc_write_coef_idx (codec,0x4 , val | (1 <<11 )); }/*
Signature · 1 line
1.7.9.5
PATCH 14/45 xtensa: replace IOCTL code definitions with constants
In reply to Zefan LiFrom: Max Filippov <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit f61bf8e7d19e0a3456a7a9ed97c399e4353698dc upstream.
This fixes userspace code that builds on other architectures but fails on xtensa due to references to structures that other architectures don't refer to. E.g. this fixes the following issue with python-2.7.8:
python-2.7.8/Modules/termios.c:861:25: error: invalid application
of 'sizeof' to incomplete type 'struct serial_multiport_struct' {"TIOCSERGETMULTI", TIOCSERGETMULTI},
python-2.7.8/Modules/termios.c:870:25: error: invalid application
of 'sizeof' to incomplete type 'struct serial_multiport_struct' {"TIOCSERSETMULTI", TIOCSERSETMULTI},
python-2.7.8/Modules/termios.c:900:24: error: invalid application
of 'sizeof' to incomplete type 'struct tty_struct' {"TIOCTTYGSTRUCT", TIOCTTYGSTRUCT},
--- arch/xtensa/include/asm/ioctls.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
arch/xtensa/include/asm/ioctls.h +10 -9
@@ -28,17 +28,17 @@#define TCSETSW 0x5403#define TCSETSF 0x5404 -#define TCGETA _IOR('t', 23, struct termio) -#define TCSETA _IOW('t', 24, struct termio) -#define TCSETAW _IOW('t', 25, struct termio) -#define TCSETAF _IOW('t', 28, struct termio) +#define TCGETA 0x80127417/* _IOR('t', 23, struct termio) */ +#define TCSETA 0x40127418/* _IOW('t', 24, struct termio) */ +#define TCSETAW 0x40127419/* _IOW('t', 25, struct termio) */ +#define TCSETAF 0x4012741C/* _IOW('t', 28, struct termio) */ #define TCSBRK _IO('t', 29)#define TCXONC _IO('t', 30)#define TCFLSH _IO('t', 31) -#define TIOCSWINSZ _IOW('t', 103, struct winsize) -#define TIOCGWINSZ _IOR('t', 104, struct winsize) +#define TIOCSWINSZ 0x40087467/* _IOW('t', 103, struct winsize) */ +#define TIOCGWINSZ 0x80087468/* _IOR('t', 104, struct winsize) */ #define TIOCSTART _IO('t', 110)/* start output, like ^Q */ #define TIOCSTOP _IO('t', 111)/* stop output, like ^S */ #define TIOCOUTQ _IOR('t', 115, int)/* output queue size */
@@ -88,7 +88,6 @@#define TIOCSETD _IOW('T', 35, int)#define TIOCGETD _IOR('T', 36, int)#define TCSBRKP _IOW('T', 37, int)/* Needed for POSIX tcsendbreak()*/ -#define TIOCTTYGSTRUCT _IOR('T', 38, struct tty_struct)/* For debugging only*/ #define TIOCSBRK _IO('T', 39)/* BSD compatibility */ #define TIOCCBRK _IO('T', 40)/* BSD compatibility */ #define TIOCGSID _IOR('T', 41, pid_t)/* Return the session ID of FD*/
@@ -111,8 +110,10 @@#define TIOCSERGETLSR _IOR('T', 89, unsigned int)/* Get line status reg. */ /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ # define TIOCSER_TEMT 0x01/* Transmitter physically empty */ -#define TIOCSERGETMULTI _IOR('T', 90, struct serial_multiport_struct)/* Get multiport config */ -#define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct)/* Set multiport config */ +#define TIOCSERGETMULTI 0x80a8545a/* Get multiport config */ +/* _IOR('T', 90, struct serial_multiport_struct) */ +#define TIOCSERSETMULTI 0x40a8545b/* Set multiport config */ +/* _IOW('T', 91, struct serial_multiport_struct) */ #define TIOCMIWAIT _IO('T', 92)/* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */
Signature · 1 line
1.7.9.5
PATCH 15/45 xtensa: fix address checks in dma_{alloc,free}_coherent
In reply to Zefan LiFrom: Alan Douglas <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 1ca49463c44c970b1ab1d71b0f268bfdf8427a7e upstream.
Virtual address is translated to the XCHAL_KSEG_CACHED region in the dma_free_coherent, but is checked to be in the 0...XCHAL_KSEG_SIZE range.
Change check for end of the range from 'addr >= X' to 'addr > X - 1' to handle the case of X == 0.
Replace 'if (C) BUG();' construct with 'BUG_ON(C);'.
--- arch/xtensa/kernel/pci-dma.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/xtensa/kernel/pci-dma.c +6 -6
@@ -48,9 +48,8 @@ dma_alloc_coherent(struct device *dev,size_t size,dma_addr_t *handle,gfp_t flag)/* We currently don't support coherent memory outside KSEG */ -if (ret <XCHAL_KSEG_CACHED_VADDR - || ret >=XCHAL_KSEG_CACHED_VADDR +XCHAL_KSEG_SIZE ) -BUG (); +BUG_ON (ret <XCHAL_KSEG_CACHED_VADDR || + ret >XCHAL_KSEG_CACHED_VADDR +XCHAL_KSEG_SIZE -1 );if (ret !=0 ) {
@@ -66,10 +65,11 @@ dma_alloc_coherent(struct device *dev,size_t size,dma_addr_t *handle,gfp_t flag)void dma_free_coherent (struct device *hwdev,size_t size,void *vaddr,dma_addr_t dma_handle) { -long addr=(long )vaddr+XCHAL_KSEG_CACHED_VADDR -XCHAL_KSEG_BYPASS_VADDR ; +unsigned long addr = (unsigned long )vaddr + +XCHAL_KSEG_CACHED_VADDR -XCHAL_KSEG_BYPASS_VADDR ; -if (addr <0 || addr >=XCHAL_KSEG_SIZE ) -BUG (); +BUG_ON (addr <XCHAL_KSEG_CACHED_VADDR || + addr >XCHAL_KSEG_CACHED_VADDR +XCHAL_KSEG_SIZE -1 );free_pages (addr,get_order (size)); }
Signature · 1 line
1.7.9.5
PATCH 16/45 xtensa: fix TLBTEMP_BASE_2 region handling in fast_second_level_miss
In reply to Zefan LiFrom: Max Filippov <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 7128039fe2dd3d59da9e4ffa036f3aaa3ba87b9f upstream.
Current definition of TLBTEMP_BASE_2 is always 32K above the TLBTEMP_BASE_1, whereas fast_second_level_miss handler for the TLBTEMP region analyzes virtual address bit (PAGE_SHIFT + DCACHE_ALIAS_ORDER) to determine TLBTEMP region where the fault happened. The size of the TLBTEMP region is also checked incorrectly: not 64K, but twice data cache way size (whicht may as well be less than the instruction cache way size).
Fix TLBTEMP_BASE_2 to be TLBTEMP_BASE_1 + data cache way size. Provide TLBTEMP_SIZE that is a greater of doubled data cache way size or the instruction cache way size, and use it to determine if the second level TLB miss occured in the TLBTEMP region.
Practical occurence of page faults in the TLBTEMP area is extremely rare, this code can be tested by deletion of all w[di]tlb instructions in the tlbtemp_mapping region.
--- arch/xtensa/include/asm/pgtable.h | 7 ++++++- arch/xtensa/kernel/entry.S | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)
arch/xtensa/include/asm/pgtable.h +6 -1
@@ -68,7 +68,12 @@#define VMALLOC_START 0xC0000000#define VMALLOC_END 0xC7FEFFFF#define TLBTEMP_BASE_1 0xC7FF0000 -#define TLBTEMP_BASE_2 0xC7FF8000 +#define TLBTEMP_BASE_2 (TLBTEMP_BASE_1 + DCACHE_WAY_SIZE) +#if 2 *DCACHE_WAY_SIZE >ICACHE_WAY_SIZE +#define TLBTEMP_SIZE (2 * DCACHE_WAY_SIZE) +#else +#define TLBTEMP_SIZE ICACHE_WAY_SIZE +#endif /* * Xtensa Linux config PTE layout (when present):
arch/xtensa/kernel/entry.S +1 -1
@@ -1629,7 +1629,7 @@ ENTRY(fast_second_level_miss) rsr a0, EXCVADDR bltu a0, a3, 2f - addi a1, a0, -(2 << (DCACHE_ALIAS_ORDER + PAGE_SHIFT)) + addi a1, a0, -TLBTEMP_SIZE bgeu a1, a3, 2f /* Check if we have to restore an ITLB mapping. */
Signature · 1 line
1.7.9.5
PATCH 17/45 xtensa: fix a6 and a7 handling in fast_syscall_xtensa
In reply to Zefan LiFrom: Max Filippov <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit d1b6ba82a50cecf94be540a3a153aa89d97511a0 upstream.
Remove restoring a6 on some return paths and instead modify and restore it in a single place, using symbolic name.
Correctly restore a7 from PT_AREG7 in case of illegal a6 value.
--- arch/xtensa/kernel/entry.S | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
arch/xtensa/kernel/entry.S +5 -7
@@ -1053,9 +1053,8 @@ ENTRY(fast_syscall_xtensa) movi a7, 4 # sizeof(unsigned int) access_ok a3, a7, a0, a2, .Leac # a0: scratch reg, a2: sp - addi a6, a6, -1 # assuming SYS_XTENSA_ATOMIC_SET = 1 - _bgeui a6, SYS_XTENSA_COUNT - 1, .Lill - _bnei a6, SYS_XTENSA_ATOMIC_CMP_SWP - 1, .Lnswp + _bgeui a6, SYS_XTENSA_COUNT, .Lill + _bnei a6, SYS_XTENSA_ATOMIC_CMP_SWP, .Lnswp /* Fall through for ATOMIC_CMP_SWP. */
@@ -1067,27 +1066,26 @@ TRY s32i a5, a3, 0 # different, modify value l32i a7, a2, PT_AREG7 # restore a7 l32i a0, a2, PT_AREG0 # restore a0 movi a2, 1 # and return 1 - addi a6, a6, 1 # restore a6 (really necessary?) rfe 1: l32i a7, a2, PT_AREG7 # restore a7 l32i a0, a2, PT_AREG0 # restore a0 movi a2, 0 # return 0 (note that we cannot set - addi a6, a6, 1 # restore a6 (really necessary?) rfe .Lnswp: /* Atomic set, add, and exg_add. */ TRY l32i a7, a3, 0 # orig + addi a6, a6, -SYS_XTENSA_ATOMIC_SET add a0, a4, a7 # + arg moveqz a0, a4, a6 # set + addi a6, a6, SYS_XTENSA_ATOMIC_SET TRY s32i a0, a3, 0 # write new value mov a0, a2 mov a2, a7 l32i a7, a0, PT_AREG7 # restore a7 l32i a0, a0, PT_AREG0 # restore a0 - addi a6, a6, 1 # restore a6 (really necessary?) rfe CATCH
@@ -1096,7 +1094,7 @@ CATCH movi a2, -EFAULT rfe -.Lill: l32i a7, a2, PT_AREG0 # restore a7 +.Lill: l32i a7, a2, PT_AREG7 # restore a7 l32i a0, a2, PT_AREG0 # restore a0 movi a2, -EINVAL rfe
Signature · 1 line
1.7.9.5
PATCH 18/45 staging: et131x: Fix errors caused by phydev->addr accesses before initialisation
In reply to Zefan LiFrom: Mark Einon <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit ec0a38bf8b28b036202070cf3ef271e343d9eafc upstream.
Fix two reported bugs, caused by et131x_adapter->phydev->addr being accessed before it is initialised, by:
- letting et131x_mii_write() take a phydev address, instead of using the one stored in adapter by default. This is so et131x_mdio_write() can use it's own addr value.
- removing implementation of et131x_mdio_reset(), as it's not needed.
- moving a call to et131x_disable_phy_coma() in et131x_pci_setup(), which uses phydev->addr, until after the mdiobus has been registered.
[lizf: Backported to 3.4:
- adjust context
- update more update more et131x_mii_write() calls in et1310_phy_access_mii_bit() and et131x_xcvr_init()]
--- drivers/staging/et131x/et131x.c | 78 +++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 44 deletions(-)
drivers/staging/et131x/et131x.c +34 -44
@@ -1478,22 +1478,16 @@ static int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value)* * Return 0 on success, errno on failure (as defined in errno.h) */ -static int et131x_mii_write (struct et131x_adapter *adapter,u8 reg,u16 value) +static int et131x_mii_write (struct et131x_adapter *adapter,u8 addr,u8 reg, +u16 value) {struct mac_regs __iomem *mac = &adapter->regs->mac; -struct phy_device *phydev = adapter->phydev;int status =0 ; -u8 addr;u32 delay =0 ;u32 mii_addr;u32 mii_cmd;u32 mii_indicator; -if (!phydev) -return -EIO ; - - addr = phydev->addr; -/* Save a local copy of the registers we are dealing with so we can * set them back */
@@ -1550,6 +1544,7 @@ static void et1310_phy_access_mii_bit(struct et131x_adapter *adapter, {u16 reg;u16 mask =0x0001 << bitnum; +struct phy_device *phydev = adapter->phydev;/* Read the requested register */ et131x_mii_read (adapter, regnum, ®);
@@ -1560,11 +1555,11 @@ static void et1310_phy_access_mii_bit(struct et131x_adapter *adapter,break ;case TRUEPHY_BIT_SET : -et131x_mii_write (adapter, regnum, reg | mask); +et131x_mii_write (adapter, phydev->addr, regnum, reg | mask);break ;case TRUEPHY_BIT_CLEAR : -et131x_mii_write (adapter, regnum, reg & ~mask); +et131x_mii_write (adapter, phydev->addr, regnum, reg & ~mask);break ;default :
@@ -1715,17 +1710,7 @@ static int et131x_mdio_write(struct mii_bus *bus, int phy_addr, int reg, u16 valstruct net_device *netdev = bus->priv;struct et131x_adapter *adapter =netdev_priv (netdev); -return et131x_mii_write (adapter, reg, value); -} - -static int et131x_mdio_reset (struct mii_bus *bus) -{ -struct net_device *netdev = bus->priv; -struct et131x_adapter *adapter =netdev_priv (netdev); - -et131x_mii_write (adapter,MII_BMCR ,BMCR_RESET ); - -return 0 ; +return et131x_mii_write (adapter, phy_addr, reg, value); }/**
@@ -1741,12 +1726,13 @@ static int et131x_mdio_reset(struct mii_bus *bus)static void et1310_phy_power_down (struct et131x_adapter *adapter,bool down) {u16 data; +struct phy_device *phydev = adapter->phydev;et131x_mii_read (adapter,MII_BMCR , &data); data &= ~BMCR_PDOWN ;if (down) data |=BMCR_PDOWN ; -et131x_mii_write (adapter,MII_BMCR , data); +et131x_mii_write (adapter, phydev->addr,MII_BMCR , data); }/**
@@ -1759,6 +1745,7 @@ static void et131x_xcvr_init(struct et131x_adapter *adapter)u16 imr;u16 isr;u16 lcr2; +struct phy_device *phydev = adapter->phydev;et131x_mii_read (adapter,PHY_INTERRUPT_STATUS , &isr);et131x_mii_read (adapter,PHY_INTERRUPT_MASK , &imr);
@@ -1770,7 +1757,7 @@ static void et131x_xcvr_init(struct et131x_adapter *adapter)ET_PHY_INT_MASK_LINKSTAT & ET_PHY_INT_MASK_ENABLE); -et131x_mii_write (adapter,PHY_INTERRUPT_MASK , imr); +et131x_mii_write (adapter, phydev->addr,PHY_INTERRUPT_MASK , imr);/* Set the LED behavior such that LED 1 indicates speed (off = * 10Mbits, blink = 100Mbits, on = 1000Mbits) and LED 2 indicates
@@ -1791,7 +1778,7 @@ static void et131x_xcvr_init(struct et131x_adapter *adapter)else lcr2 |= (LED_VAL_LINKON <<LED_TXRX_SHIFT ); -et131x_mii_write (adapter,PHY_LED_2 , lcr2); +et131x_mii_write (adapter, phydev->addr,PHY_LED_2 , lcr2); } }
@@ -4202,14 +4189,14 @@ static void et131x_adjust_link(struct net_device *netdev)et131x_mii_read (adapter,PHY_MPHY_CONTROL_REG , ®ister18); -et131x_mii_write (adapter,PHY_MPHY_CONTROL_REG , - register18 |0x4 ); -et131x_mii_write (adapter,PHY_INDEX_REG , +et131x_mii_write (adapter, phydev->addr, +PHY_MPHY_CONTROL_REG , register18 |0x4 ); +et131x_mii_write (adapter, phydev->addr,PHY_INDEX_REG , register18 |0x8402 ); -et131x_mii_write (adapter,PHY_DATA_REG , +et131x_mii_write (adapter, phydev->addr,PHY_DATA_REG , register18 |511 ); -et131x_mii_write (adapter,PHY_MPHY_CONTROL_REG , - register18); +et131x_mii_write (adapter, phydev->addr, +PHY_MPHY_CONTROL_REG , register18); }et1310_config_flow_control (adapter);
@@ -4221,7 +4208,8 @@ static void et131x_adjust_link(struct net_device *netdev)et131x_mii_read (adapter,PHY_CONFIG , ®); reg &= ~ET_PHY_CONFIG_TX_FIFO_DEPTH ; reg |=ET_PHY_CONFIG_FIFO_DEPTH_32 ; -et131x_mii_write (adapter,PHY_CONFIG , reg); +et131x_mii_write (adapter, phydev->addr,PHY_CONFIG , + reg); }et131x_set_rx_dma_timer (adapter);
@@ -4254,14 +4242,17 @@ static void et131x_adjust_link(struct net_device *netdev)et131x_mii_read (adapter,PHY_MPHY_CONTROL_REG , ®ister18); -et131x_mii_write (adapter,PHY_MPHY_CONTROL_REG , - register18 |0x4 ); -et131x_mii_write (adapter,PHY_INDEX_REG , - register18 |0x8402 ); -et131x_mii_write (adapter,PHY_DATA_REG , - register18 |511 ); -et131x_mii_write (adapter,PHY_MPHY_CONTROL_REG , - register18); +et131x_mii_write (adapter, phydev->addr, +PHY_MPHY_CONTROL_REG , + register18 |0x4 ); +et131x_mii_write (adapter, phydev->addr, +PHY_INDEX_REG , + register18 |0x8402 ); +et131x_mii_write (adapter, phydev->addr, +PHY_DATA_REG , register18 |511 ); +et131x_mii_write (adapter, phydev->addr, +PHY_MPHY_CONTROL_REG , + register18); }/* Free the packets being actively sent & stopped */
@@ -5343,10 +5334,6 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,/* Copy address into the net_device struct */ memcpy (netdev->dev_addr, adapter->addr,ETH_ALEN ); -/* Init variable for counting how long we do not have link status */ - adapter->boot_coma =0 ; -et1310_disable_phy_coma (adapter); - rc = -ENOMEM ;/* Setup the mii_bus struct */
@@ -5362,7 +5349,6 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev, adapter->mii_bus->priv = netdev; adapter->mii_bus->read = et131x_mdio_read; adapter->mii_bus->write = et131x_mdio_write; - adapter->mii_bus->reset = et131x_mdio_reset; adapter->mii_bus->irq =kmalloc (sizeof (int )*PHY_MAX_ADDR ,GFP_KERNEL );if (!adapter->mii_bus->irq) {dev_err (&pdev->dev,"mii_bus irq allocation failed\n" );
@@ -5387,6 +5373,10 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,/* Setup et1310 as per the documentation */ et131x_adapter_setup (adapter); +/* Init variable for counting how long we do not have link status */ + adapter->boot_coma =0 ; +et1310_disable_phy_coma (adapter); +/* We can enable interrupts now * * NOTE - Because registration of interrupt handler is done in the
Signature · 1 line
1.7.9.5
PATCH 19/45 USB: option: add VIA Telecom CDS7 chipset device id
In reply to Zefan LiFrom: Brennan Ashton <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit d77302739d900bbca5e901a3b7ac48c907ee6c93 upstream.
This VIA Telecom baseband processor is used is used by by u-blox in both the FW2770 and FW2760 products and may be used in others as well.
This patch has been tested on both of these modem versions.
--- drivers/usb/serial/option.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/serial/option.c +5 -0
@@ -499,6 +499,10 @@ static void option_instat_callback(struct urb *urb);#define INOVIA_VENDOR_ID 0x20a6#define INOVIA_SEW858 0x1105 +/* VIA Telecom */ +#define VIATELECOM_VENDOR_ID 0x15eb +#define VIATELECOM_PRODUCT_CDS7 0x0001 +/* some devices interfaces need special handling due to a number of reasons */ enum option_blacklist_reason {OPTION_BLACKLIST_NONE =0 ,
@@ -1744,6 +1748,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ { USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) }, + { USB_DEVICE(VIATELECOM_VENDOR_ID, VIATELECOM_PRODUCT_CDS7) }, { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, option_ids);
Signature · 1 line
1.7.9.5
PATCH 20/45 USB: ftdi_sio: add Basic Micro ATOM Nano USB2Serial PID
In reply to Zefan LiFrom: Johan Hovold <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 6552cc7f09261db2aeaae389aa2c05a74b3a93b4 upstream.
Add device id for Basic Micro ATOM Nano USB2Serial adapters.
--- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 2 ++ 2 files changed, 3 insertions(+)
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -162,6 +162,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) }, { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) }, { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_BM_ATOM_NANO_PID) }, { USB_DEVICE(FTDI_VID, FTDI_NXTCAM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_EV3CON_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) },
drivers/usb/serial/ftdi_sio_ids.h +2 -0
@@ -42,6 +42,8 @@/* www.candapter.com Ewert Energy Systems CANdapter device */ #define FTDI_CANDAPTER_PID 0x9F80/* Product Id */ +#define FTDI_BM_ATOM_NANO_PID 0xa559/* Basic Micro ATOM Nano USB2Serial */ +/* * Texas Instruments XDS100v2 JTAG / BeagleBone A3 * http://processors.wiki.ti.com/index.php/XDS100
Signature · 1 line
1.7.9.5
PATCH 21/45 USB: serial: pl2303: add device id for ztek device
In reply to Zefan LiFrom: Greg KH <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 91fcb1ce420e0a5f8d92d556d7008a78bc6ce1eb upstream.
This adds a new device id to the pl2303 driver for the ZTEK device.
--- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + 2 files changed, 2 insertions(+)
drivers/usb/serial/pl2303.c +1 -0
@@ -51,6 +51,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GPRS) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_HCR331) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MOTOROLA) }, + { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ZTEK) }, { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) }, { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) }, { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
drivers/usb/serial/pl2303.h +1 -0
@@ -22,6 +22,7 @@#define PL2303_PRODUCT_ID_GPRS 0x0609#define PL2303_PRODUCT_ID_HCR331 0x331a#define PL2303_PRODUCT_ID_MOTOROLA 0x0307 +#define PL2303_PRODUCT_ID_ZTEK 0xe1f1#define ATEN_VENDOR_ID 0x0557#define ATEN_VENDOR_ID2 0x0547
Signature · 1 line
1.7.9.5
PATCH 22/45 USB: ftdi_sio: Added PID for new ekey device
In reply to Zefan LiFrom: Jaša Bartelj <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 646907f5bfb0782c731ae9ff6fb63471a3566132 upstream.
Added support to the ftdi_sio driver for ekey Converter USB which uses an FT232BM chip.
--- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 5 +++++ 2 files changed, 7 insertions(+)
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -957,6 +957,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) }, { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) }, { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) }, +/* ekey Devices */ + { USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +5 -0
@@ -1371,3 +1371,8 @@#define BRAINBOXES_US_160_6_PID 0x9006/* US-160 16xRS232 1Mbaud Port 11 and 12 */ #define BRAINBOXES_US_160_7_PID 0x9007/* US-160 16xRS232 1Mbaud Port 13 and 14 */ #define BRAINBOXES_US_160_8_PID 0x9008/* US-160 16xRS232 1Mbaud Port 15 and 16 */ + +/* +* ekey biometric systems GmbH (http://ekey.net/) +*/ +#define FTDI_EKEY_CONV_USB_PID 0xCB08/* Converter USB */
Signature · 1 line
1.7.9.5
PATCH 23/45 xhci: Treat not finding the event_seg on COMP_STOP the same as COMP_STOP_INVAL
In reply to Zefan LiFrom: Hans de Goede <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 9a54886342e227433aebc9d374f8ae268a836475 upstream.
When using a Renesas uPD720231 chipset usb-3 uas to sata bridge with a 120G Crucial M500 ssd, model string: Crucial_ CT120M500SSD1, together with a the integrated Intel xhci controller on a Haswell laptop:
00:14.0 USB controller [0c03]: Intel Corporation 8 Series USB xHCI HC [8086:9c31] (rev 04)
The following error gets logged to dmesg:
xhci error: Transfer event TRB DMA ptr not part of current TD
Treating COMP_STOP the same as COMP_STOP_INVAL when no event_seg gets found fixes this.
--- drivers/usb/host/xhci-ring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-ring.c +2 -1
@@ -2528,7 +2528,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,* last TRB of the previous TD. The command completion handle * will take care the rest. */ -if (!event_seg && trb_comp_code ==COMP_STOP_INVAL ) { +if (!event_seg && (trb_comp_code ==COMP_STOP || + trb_comp_code ==COMP_STOP_INVAL )) { ret =0 ; goto cleanup; }
Signature · 1 line
1.7.9.5
PATCH 24/45 usb: xhci: amd chipset also needs short TX quirk
In reply to Zefan LiFrom: Huang Rui <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 2597fe99bb0259387111d0431691f5daac84f5a5 upstream.
AMD xHC also needs short tx quirk after tested on most of chipset generations. That's because there is the same incorrect behavior like Fresco Logic host. Please see below message with on USB webcam attached on xHC host:
[ 139.262944] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk? [ 139.266934] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk? [ 139.270913] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk? [ 139.274937] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk? [ 139.278914] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk? [ 139.282936] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk? [ 139.286915] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk? [ 139.290938] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk? [ 139.294913] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk? [ 139.298917] xhci_hcd 0000:00:10.0: WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk?
--- drivers/usb/host/xhci-pci.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/host/xhci-pci.c +4 -0
@@ -98,6 +98,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)/* AMD PLL quirk */ if (pdev->vendor ==PCI_VENDOR_ID_AMD &&usb_amd_find_chipset_info ()) xhci->quirks |=XHCI_AMD_PLL_FIX ; + +if (pdev->vendor ==PCI_VENDOR_ID_AMD ) + xhci->quirks |=XHCI_TRUST_TX_LENGTH ; +if (pdev->vendor ==PCI_VENDOR_ID_INTEL && pdev->device ==PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI ) { xhci->quirks |=XHCI_EP_LIMIT_QUIRK ;
Signature · 1 line
1.7.9.5
PATCH 25/45 USB: whiteheat: Added bounds checking for bulk command response
In reply to Zefan LiFrom: James Forshaw <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 6817ae225cd650fb1c3295d769298c38b1eba818 upstream.
This patch fixes a potential security issue in the whiteheat USB driver which might allow a local attacker to cause kernel memory corrpution. This is due to an unchecked memcpy into a fixed size buffer (of 64 bytes). On EHCI and XHCI busses it's possible to craft responses greater than 64 bytes leading a buffer overflow.
--- drivers/usb/serial/whiteheat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/serial/whiteheat.c +6 -1
@@ -953,6 +953,10 @@ static void command_port_read_callback(struct urb *urb)dbg ("%s - command_info is NULL, exiting." , __func__);return ; } +if (!urb->actual_length) { +dev_dbg (&urb->dev->dev,"%s - empty response, exiting.\n" , __func__); +return ; + }if (status) {dbg ("%s - nonzero urb status: %d" , __func__, status);if (status != -ENOENT )
@@ -974,7 +978,8 @@ static void command_port_read_callback(struct urb *urb)/* These are unsolicited reports from the firmware, hence no waiting command to wakeup */ dbg ("%s - event received" , __func__); - }else if (data[0 ] ==WHITEHEAT_GET_DTR_RTS ) { + }else if ((data[0 ] ==WHITEHEAT_GET_DTR_RTS ) && + (urb->actual_length -1 <=sizeof (command_info->result_buffer))) {memcpy (command_info->result_buffer, &data[1 ], urb->actual_length -1 ); command_info->command_finished =WHITEHEAT_CMD_COMPLETE ;
Signature · 1 line
1.7.9.5
PATCH 26/45 HID: logitech-dj: prevent false errors to be shown
In reply to Zefan LiFrom: Benjamin Tissoires <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 5abfe85c1d4694d5d4bbd13ecc166262b937adf0 upstream.
Commit "HID: logitech: perform bounds checking on device_id early enough" unfortunately leaks some errors to dmesg which are not real ones:
- if the report is not a DJ one, then there is not point in checking the device_id
- the receiver (index 0) can also receive some notifications which can be safely ignored given the current implementation
Move out the test regarding the report_id and also discards printing errors when the receiver got notified.
--- drivers/hid/hid-logitech-dj.c | 43 ++++++++++++++++++++++++----------------- drivers/hid/hid-logitech-dj.h | 1 + 2 files changed, 26 insertions(+), 18 deletions(-)
drivers/hid/hid-logitech-dj.c +25 -18
@@ -681,7 +681,6 @@ static int logi_dj_raw_event(struct hid_device *hdev,struct dj_receiver_dev *djrcv_dev =hid_get_drvdata (hdev);struct dj_report *dj_report = (struct dj_report *) data;unsigned long flags; -bool report_processed = false;dbg_hid ("%s, size:%d\n" , __func__, size);
@@ -708,34 +707,42 @@ static int logi_dj_raw_event(struct hid_device *hdev,* device (via hid_input_report() ) and return 1 so hid-core does not do * anything else with it. */ + +/* case 1) */ +if (data[0 ] !=REPORT_ID_DJ_SHORT ) +return false; +if ((dj_report->device_index <DJ_DEVICE_INDEX_MIN ) || (dj_report->device_index >DJ_DEVICE_INDEX_MAX )) { -dev_err (&hdev->dev,"%s: invalid device index:%d\n" , +/* +* Device index is wrong, bail out. +* This driver can ignore safely the receiver notifications, +* so ignore those reports too. +*/ +if (dj_report->device_index !=DJ_RECEIVER_INDEX ) +dev_err (&hdev->dev,"%s: invalid device index:%d\n" , __func__, dj_report->device_index);return false; }spin_lock_irqsave (&djrcv_dev->lock, flags); -if (dj_report->report_id ==REPORT_ID_DJ_SHORT ) { -switch (dj_report->report_type) { -case REPORT_TYPE_NOTIF_DEVICE_PAIRED : -case REPORT_TYPE_NOTIF_DEVICE_UNPAIRED : -logi_dj_recv_queue_notification (djrcv_dev, dj_report); -break ; -case REPORT_TYPE_NOTIF_CONNECTION_STATUS : -if (dj_report->report_params[CONNECTION_STATUS_PARAM_STATUS ] == -STATUS_LINKLOSS ) { -logi_dj_recv_forward_null_report (djrcv_dev, dj_report); - } -break ; -default : -logi_dj_recv_forward_report (djrcv_dev, dj_report); +switch (dj_report->report_type) { +case REPORT_TYPE_NOTIF_DEVICE_PAIRED : +case REPORT_TYPE_NOTIF_DEVICE_UNPAIRED : +logi_dj_recv_queue_notification (djrcv_dev, dj_report); +break ; +case REPORT_TYPE_NOTIF_CONNECTION_STATUS : +if (dj_report->report_params[CONNECTION_STATUS_PARAM_STATUS ] == +STATUS_LINKLOSS ) { +logi_dj_recv_forward_null_report (djrcv_dev, dj_report); } - report_processed = true; +break ; +default : +logi_dj_recv_forward_report (djrcv_dev, dj_report); }spin_unlock_irqrestore (&djrcv_dev->lock, flags); -return report_processed; +return true; } static int logi_dj_probe(struct hid_device *hdev,
drivers/hid/hid-logitech-dj.h +1 -0
@@ -27,6 +27,7 @@#define DJ_MAX_PAIRED_DEVICES 6#define DJ_MAX_NUMBER_NOTIFICATIONS 8 +#define DJ_RECEIVER_INDEX 0#define DJ_DEVICE_INDEX_MIN 1#define DJ_DEVICE_INDEX_MAX 6
Signature · 1 line
1.7.9.5
PATCH 27/45 USB: sisusb: add device id for Magic Control USB video
In reply to Zefan LiFrom: Stephen Hemminger <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 5b6b80aeb21091ed3030b9b6aae597d81326f1aa upstream.
I have a j5 create (JUA210) USB 2 video device and adding it device id to SIS USB video gets it to work.
--- drivers/usb/misc/sisusbvga/sisusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/misc/sisusbvga/sisusb.c +1 -0
@@ -3248,6 +3248,7 @@ static const struct usb_device_id sisusb_table[] = { { USB_DEVICE(0x0711, 0x0918) }, { USB_DEVICE(0x0711, 0x0920) }, { USB_DEVICE(0x0711, 0x0950) }, + { USB_DEVICE(0x0711, 0x5200) }, { USB_DEVICE(0x182d, 0x021c) }, { USB_DEVICE(0x182d, 0x0269) }, { }
Signature · 1 line
1.7.9.5
PATCH 28/45 NFSv4: Fix problems with close in the presence of a delegation
In reply to Zefan LiFrom: Trond Myklebust <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit aee7af356e151494d5014f57b33460b162f181b5 upstream.
In the presence of delegations, we can no longer assume that the state->n_rdwr, state->n_rdonly, state->n_wronly reflect the open stateid share mode, and so we need to calculate the initial value for calldata->arg.fmode using the state->flags.
--- fs/nfs/nfs4proc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
fs/nfs/nfs4proc.c +12 -5
@@ -2051,6 +2051,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) {struct nfs4_closedata *calldata = data;struct nfs4_state *state = calldata->state; +bool is_rdonly, is_wronly, is_rdwr;int call_close =0 ;dprintk ("%s: begin!\n" , __func__);
@@ -2058,18 +2059,24 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data)return ; task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OPEN_DOWNGRADE ]; - calldata->arg.fmode =FMODE_READ |FMODE_WRITE ;spin_lock (&state->owner->so_lock); + is_rdwr =test_bit (NFS_O_RDWR_STATE , &state->flags); + is_rdonly =test_bit (NFS_O_RDONLY_STATE , &state->flags); + is_wronly =test_bit (NFS_O_WRONLY_STATE , &state->flags); +/* Calculate the current open share mode */ + calldata->arg.fmode =0 ; +if (is_rdonly || is_rdwr) + calldata->arg.fmode |=FMODE_READ ; +if (is_wronly || is_rdwr) + calldata->arg.fmode |=FMODE_WRITE ;/* Calculate the change in open mode */ if (state->n_rdwr ==0 ) {if (state->n_rdonly ==0 ) { - call_close |=test_bit (NFS_O_RDONLY_STATE , &state->flags); - call_close |=test_bit (NFS_O_RDWR_STATE , &state->flags); + call_close |= is_rdonly || is_rdwr; calldata->arg.fmode &= ~FMODE_READ ; }if (state->n_wronly ==0 ) { - call_close |=test_bit (NFS_O_WRONLY_STATE , &state->flags); - call_close |=test_bit (NFS_O_RDWR_STATE , &state->flags); + call_close |= is_wronly || is_rdwr; calldata->arg.fmode &= ~FMODE_WRITE ; } }
Signature · 1 line
1.7.9.5
PATCH 29/45 HID: magicmouse: sanity check report size in raw_event() callback
In reply to Zefan LiFrom: Jiri Kosina <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit c54def7bd64d7c0b6993336abcffb8444795bf38 upstream.
The report passed to us from transport driver could potentially be arbitrarily large, therefore we better sanity-check it so that magicmouse_emit_touch() gets only valid values of raw_id.
--- drivers/hid/hid-magicmouse.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hid/hid-magicmouse.c +10 -0
@@ -308,6 +308,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,if (size <4 || ((size -4 ) %9 ) !=0 )return 0 ; npoints = (size -4 ) /9 ; +if (npoints >15 ) { +hid_warn (hdev,"invalid size value (%d) for TRACKPAD_REPORT_ID\n" , + size); +return 0 ; + } msc->ntouches =0 ;for (ii =0 ; ii < npoints; ii++)magicmouse_emit_touch (msc, ii, data + ii *9 +4 );
@@ -331,6 +336,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,if (size <6 || ((size -6 ) %8 ) !=0 )return 0 ; npoints = (size -6 ) /8 ; +if (npoints >15 ) { +hid_warn (hdev,"invalid size value (%d) for MOUSE_REPORT_ID\n" , + size); +return 0 ; + } msc->ntouches =0 ;for (ii =0 ; ii < npoints; ii++)magicmouse_emit_touch (msc, ii, data + ii *8 +6 );
Signature · 1 line
1.7.9.5
PATCH 30/45 HID: picolcd: sanity check report size in raw_event() callback
In reply to Zefan LiFrom: Jiri Kosina <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 844817e47eef14141cf59b8d5ac08dd11c0a9189 upstream.
The report passed to us from transport driver could potentially be arbitrarily large, therefore we better sanity-check it so that raw_data that we hold in picolcd_pending structure are always kept within proper bounds.
--- drivers/hid/hid-picolcd.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/hid/hid-picolcd.c +6 -0
@@ -2370,6 +2370,12 @@ static int picolcd_raw_event(struct hid_device *hdev,if (!data)return 1 ; +if (size >64 ) { +hid_warn (hdev,"invalid size value (%d) for picolcd raw event\n" , + size); +return 0 ; + } +if (report->id ==REPORT_KEY_STATE ) {if (data->input_keys) ret =picolcd_raw_keypad (data, report, raw_data+1 , size-1 );
Signature · 1 line
1.7.9.5
PATCH 31/45 ARM: 8128/1: abort: don't clear the exclusive monitors
In reply to Zefan LiFrom: Mark Rutland <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 85868313177700d20644263a782351262d2aff84 upstream.
The ARMv6 and ARMv7 early abort handlers clear the exclusive monitors upon entry to the kernel, but this is redundant:
- We clear the monitors on every exception return since commit 200b812d0084 ("Clear the exclusive monitor when returning from an exception"), so this is not necessary to ensure the monitors are cleared before returning from a fault handler.
- Any dummy STREX will target a temporary scratch area in memory, and may succeed or fail without corrupting useful data. Its status value will not be used.
- Any other STREX in the kernel must be preceded by an LDREX, which will initialise the monitors consistently and will not depend on the earlier state of the monitors.
Therefore we have no reason to care about the initial state of the exclusive monitors when a data abort is taken, and clearing the monitors prior to exception return (as we already do) is sufficient.
This patch removes the redundant clearing of the exclusive monitors from the early abort handlers.
--- arch/arm/mm/abort-ev6.S | 6 ------ arch/arm/mm/abort-ev7.S | 6 ------ 2 files changed, 12 deletions(-)
arch/arm/mm/abort-ev6.S +0 -6
@@ -17,12 +17,6 @@ */ .align 5 ENTRY(v6_early_abort) -#ifdef CONFIG_CPU_V6 - sub r1, sp, #4 @ Get unused stack location - strex r0, r1, [r1] @ Clear the exclusive monitor -#elif defined(CONFIG_CPU_32v6K) - clrex -#endif mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR /*
arch/arm/mm/abort-ev7.S +0 -6
@@ -13,12 +13,6 @@ */ .align 5 ENTRY(v7_early_abort) - /* - * The effect of data aborts on on the exclusive access monitor are - * UNPREDICTABLE. Do a CLREX to clear the state - */ - clrex - mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR
Signature · 1 line
1.7.9.5
PATCH 32/45 ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex
In reply to Zefan LiFrom: Mark Rutland <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 2c32c65e3726c773760038910be30cce1b4d4149 upstream.
On revisions of Cortex-A15 prior to r3p3, a CLREX instruction at PL1 may falsely trigger a watchpoint exception, leading to potential data aborts during exception return and/or livelock.
This patch resolves the issue in the following ways:
- Replacing our uses of CLREX with a dummy STREX sequence instead (as we did for v6 CPUs).
- Removing the clrex code from v7_exit_coherency_flush and derivatives, since this only exists as a minor performance improvement when non-cached exclusives are in use (Linux doesn't use these).
Benchmarking on a variety of ARM cores revealed no measurable performance difference with this change applied, so the change is performed unconditionally and no new Kconfig entry is added.
[lizf: Backported to 3.4:
- Drop changes to arch/arm/include/asm/cacheflush.h and arch/arm/mach-exynos/mcpm-exynos.c]
--- arch/arm/kernel/entry-header.S | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
arch/arm/kernel/entry-header.S +15 -14
@@ -76,26 +76,21 @@ #ifndef CONFIG_THUMB2_KERNEL .macro svc_exit, rpsr msr spsr_cxsf, \rpsr -#if defined(CONFIG_CPU_V6) - ldr r0, [sp] - strex r1, r2, [sp] @ clear the exclusive monitor - ldmib sp, {r1 - pc}^ @ load r1 - pc, cpsr -#elif defined(CONFIG_CPU_32v6K) - clrex @ clear the exclusive monitor - ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr -#else - ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K) + @ We must avoid clrex due to Cortex-A15 erratum #830321 + sub r0, sp, #4 @ uninhabited address + strex r1, r2, [r0] @ clear the exclusive monitor #endif + ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr .endm .macro restore_user_regs, fast = 0, offset = 0 ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr ldr lr, [sp, #\offset + S_PC]! @ get pc msr spsr_cxsf, r1 @ save in spsr_svc -#if defined(CONFIG_CPU_V6) +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K) + @ We must avoid clrex due to Cortex-A15 erratum #830321 strex r1, r2, [sp] @ clear the exclusive monitor -#elif defined(CONFIG_CPU_32v6K) - clrex @ clear the exclusive monitor #endif .if \fast ldmdb sp, {r1 - lr}^ @ get calling r1 - lr
@@ -123,7 +118,10 @@ .macro svc_exit, rpsr ldr lr, [sp, #S_SP] @ top of the stack ldrd r0, r1, [sp, #S_LR] @ calling lr and pc - clrex @ clear the exclusive monitor + + @ We must avoid clrex due to Cortex-A15 erratum #830321 + strex r2, r1, [sp, #S_LR] @ clear the exclusive monitor + stmdb lr!, {r0, r1, \rpsr} @ calling lr and rfe context ldmia sp, {r0 - r12} mov sp, lr
@@ -132,13 +130,16 @@ .endm .macro restore_user_regs, fast = 0, offset = 0 - clrex @ clear the exclusive monitor mov r2, sp load_user_sp_lr r2, r3, \offset + S_SP @ calling sp, lr ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr ldr lr, [sp, #\offset + S_PC] @ get pc add sp, sp, #\offset + S_SP msr spsr_cxsf, r1 @ save in spsr_svc + + @ We must avoid clrex due to Cortex-A15 erratum #830321 + strex r1, r2, [sp] @ clear the exclusive monitor + .if \fast ldmdb sp, {r1 - r12} @ get calling r1 - r12 .else
Signature · 1 line
1.7.9.5
PATCH 33/45 USB: serial: fix potential stack buffer overflow
In reply to Zefan LiFrom: Johan Hovold <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit d979e9f9ecab04c1ecca741370e30a8a498893f5 upstream.
Make sure to verify the maximum number of endpoints per type to avoid writing beyond the end of a stack-allocated array.
The current usb-serial implementation is limited to eight ports per interface but failed to verify that the number of endpoints of a certain type reported by a device did not exceed this limit.
--- drivers/usb/serial/usb-serial.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
drivers/usb/serial/usb-serial.c +20 -10
@@ -794,29 +794,37 @@ int usb_serial_probe(struct usb_interface *interface,if (usb_endpoint_is_bulk_in (endpoint)) {/* we found a bulk in endpoint */ dbg ("found bulk in on endpoint %d" , i); - bulk_in_endpoint[num_bulk_in] = endpoint; - ++num_bulk_in; +if (num_bulk_in <MAX_NUM_PORTS ) { + bulk_in_endpoint[num_bulk_in] = endpoint; + ++num_bulk_in; + } }if (usb_endpoint_is_bulk_out (endpoint)) {/* we found a bulk out endpoint */ dbg ("found bulk out on endpoint %d" , i); - bulk_out_endpoint[num_bulk_out] = endpoint; - ++num_bulk_out; +if (num_bulk_out <MAX_NUM_PORTS ) { + bulk_out_endpoint[num_bulk_out] = endpoint; + ++num_bulk_out; + } }if (usb_endpoint_is_int_in (endpoint)) {/* we found a interrupt in endpoint */ dbg ("found interrupt in on endpoint %d" , i); - interrupt_in_endpoint[num_interrupt_in] = endpoint; - ++num_interrupt_in; +if (num_interrupt_in <MAX_NUM_PORTS ) { + interrupt_in_endpoint[num_interrupt_in] = endpoint; + ++num_interrupt_in; + } }if (usb_endpoint_is_int_out (endpoint)) {/* we found an interrupt out endpoint */ dbg ("found interrupt out on endpoint %d" , i); - interrupt_out_endpoint[num_interrupt_out] = endpoint; - ++num_interrupt_out; +if (num_interrupt_out <MAX_NUM_PORTS ) { + interrupt_out_endpoint[num_interrupt_out] = endpoint; + ++num_interrupt_out; + } } }
@@ -839,8 +847,10 @@ int usb_serial_probe(struct usb_interface *interface,if (usb_endpoint_is_int_in (endpoint)) {/* we found a interrupt in endpoint */ dbg ("found interrupt in for Prolific device on separate interface" ); - interrupt_in_endpoint[num_interrupt_in] = endpoint; - ++num_interrupt_in; +if (num_interrupt_in <MAX_NUM_PORTS ) { + interrupt_in_endpoint[num_interrupt_in] = endpoint; + ++num_interrupt_in; + } } } }
Signature · 1 line
1.7.9.5
PATCH 34/45 USB: serial: fix potential heap buffer overflow
In reply to Zefan LiFrom: Johan Hovold <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 5654699fb38512bdbfc0f892ce54fce75bdc2bab upstream.
Make sure to verify the number of ports requested by subdriver to avoid writing beyond the end of fixed-size array in interface data.
The current usb-serial implementation is limited to eight ports per interface but failed to verify that the number of ports requested by a subdriver (which could have been determined from device descriptors) did not exceed this limit.
--- drivers/usb/serial/usb-serial.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/serial/usb-serial.c +5 -0
@@ -889,6 +889,11 @@ int usb_serial_probe(struct usb_interface *interface, num_ports = type->num_ports; } +if (num_ports >MAX_NUM_PORTS ) { +dev_warn (&interface->dev,"too many ports requested: %d\n" , num_ports); + num_ports =MAX_NUM_PORTS ; + } + serial->num_ports = num_ports; serial->num_bulk_in = num_bulk_in; serial->num_bulk_out = num_bulk_out;
Signature · 1 line
1.7.9.5
PATCH 35/45 MIPS: perf: Fix build error caused by unused counters_per_cpu_to_total()
In reply to Zefan LiFrom: Florian Fainelli <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 6c37c9580409af7dc664bb6af0a85d540d63aeea upstream.
cc1: warnings being treated as errorsarch/mips/kernel/perf_event_mipsxx.c:166: error: 'counters_per_cpu_to_total' defined but not used make[2]: *** [arch/mips/kernel/perf_event_mipsxx.o] Error 1
make[2]: *** Waiting for unfinished jobs....
It was first introduced by 82091564cfd7ab8def42777a9c662dbf655c5d25 [MIPS:
perf: Add support for 64-bit perf counters.] in 3.2.
Patchwork: https://patchwork.linux-mips.org/patch/3357/
--- arch/mips/kernel/perf_event_mipsxx.c | 5 ----- 1 file changed, 5 deletions(-)
arch/mips/kernel/perf_event_mipsxx.c +0 -5
@@ -162,11 +162,6 @@ static unsigned int counters_total_to_per_cpu(unsigned int counters) return counters >> vpe_shift(); } -static unsigned int counters_per_cpu_to_total (unsigned int counters) -{ -return counters <<vpe_shift (); -} -#else /* !CONFIG_MIPS_MT_SMP */ #define vpe_id () 0
Signature · 1 line
1.7.9.5
PATCH 36/45 MIPS: Fix accessing to per-cpu data when flushing the cache
In reply to Zefan LiFrom: Ralf Baechle <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit ff522058bd717506b2fa066fa564657f2b86477e upstream.
This fixes the following issue
BUG: using smp_processor_id() in preemptible [00000000] code: kjournald/1761 caller is blast_dcache32+0x30/0x254 Call Trace: [<8047f02c>] dump_stack+0x8/0x34 [<802e7e40>] debug_smp_processor_id+0xe0/0xf0 [<80114d94>] blast_dcache32+0x30/0x254 [<80118484>] r4k_dma_cache_wback_inv+0x200/0x288 [<80110ff0>] mips_dma_map_sg+0x108/0x180 [<80355098>] ide_dma_prepare+0xf0/0x1b8 [<8034eaa4>] do_rw_taskfile+0x1e8/0x33c [<8035951c>] ide_do_rw_disk+0x298/0x3e4 [<8034a3c4>] do_ide_request+0x2e0/0x704 [<802bb0dc>] __blk_run_queue+0x44/0x64 [<802be000>] queue_unplugged.isra.36+0x1c/0x54 [<802beb94>] blk_flush_plug_list+0x18c/0x24c [<802bec6c>] blk_finish_plug+0x18/0x48 [<8026554c>] journal_commit_transaction+0x3b8/0x151c [<80269648>] kjournald+0xec/0x238 [<8014ac00>] kthread+0xb8/0xc0 [<8010268c>] ret_from_kernel_thread+0x14/0x1c
Caches in most systems are identical - but not always, so we can't avoid the use of smp_call_function() by just looking at the boot CPU's data, have to fiddle with preemption instead.
Patchwork: https://patchwork.linux-mips.org/patch/5835
--- arch/mips/mm/c-r4k.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/mips/mm/c-r4k.c +5 -0
@@ -12,6 +12,7 @@#include <linux/highmem.h> #include <linux/kernel.h> #include <linux/linkage.h> +#include <linux/preempt.h> #include <linux/sched.h> #include <linux/smp.h> #include <linux/mm.h>
@@ -598,6 +599,7 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size)/* Catch bad driver code */ BUG_ON (size ==0 ); +preempt_disable ();if (cpu_has_inclusive_pcaches) {if (size >= scache_size)r4k_blast_scache ();
@@ -618,6 +620,7 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size)R4600_HIT_CACHEOP_WAR_IMPL ;blast_dcache_range (addr, addr + size); } +preempt_enable ();bc_wback_inv (addr, size);__sync ();
@@ -628,6 +631,7 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size)/* Catch bad driver code */ BUG_ON (size ==0 ); +preempt_disable ();if (cpu_has_inclusive_pcaches) {if (size >= scache_size)r4k_blast_scache ();
@@ -663,6 +667,7 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size)cache_op (Hit_Writeback_Inv_D, (addr + size -1 ) & almask);blast_inv_dcache_range (addr, addr + size); } +preempt_enable ();bc_inv (addr, size);__sync ();
Signature · 1 line
1.7.9.5
PATCH 37/45 openrisc: add missing header inclusion
In reply to Zefan LiFrom: Stefan Kristiansson <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 160d83781a32e94a1e337efd6722939001e62398 upstream.
Prevents build issue with updated toolchain
--- arch/openrisc/kernel/head.S | 1 + 1 file changed, 1 insertion(+)
arch/openrisc/kernel/head.S +1 -0
@@ -19,6 +19,7 @@ #include <linux/threads.h> #include <linux/errno.h> #include <linux/init.h> +#include <linux/serial_reg.h> #include <asm/processor.h> #include <asm/page.h> #include <asm/mmu.h>
Signature · 1 line
1.7.9.5
PATCH 38/45 slab/mempolicy: always use local policy from interrupt context
In reply to Zefan LiFrom: Andi Kleen <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit e7b691b085fda913830e5280ae6f724b2a63c824 upstream.
slab_node() could access current->mempolicy from interrupt context. However there's a race condition during exit where the mempolicy is first freed and then the pointer zeroed.
Using this from interrupts seems bogus anyways. The interrupt will interrupt a random process and therefore get a random mempolicy. Many times, this will be idle's, which noone can change.
Just disable this here and always use local for slab from interrupts. I also cleaned up the callers of slab_node a bit which always passed the same argument.
I believe the original mempolicy code did that in fact, so it's likely a regression.
v2: send version with correct logic
v3: simplify. fix typo.
[[email protected]: Rework control flow based on feedback from [email protected], fix logic, and cleanup current task_struct reference]
--- include/linux/mempolicy.h | 2 +- mm/mempolicy.c | 8 +++++++- mm/slab.c | 4 ++-- mm/slub.c | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-)
include/linux/mempolicy.h +1 -1
@@ -205,7 +205,7 @@ extern struct zonelist *huge_zonelist(struct vm_area_struct *vma,extern bool init_nodemask_of_mempolicy (nodemask_t *mask);extern bool mempolicy_nodemask_intersects (struct task_struct *tsk,const nodemask_t *mask); -extern unsigned slab_node (struct mempolicy *policy); +extern unsigned slab_node (void );extern enum zone_type policy_zone;
mm/mempolicy.c +7 -1
@@ -1609,8 +1609,14 @@ static unsigned interleave_nodes(struct mempolicy *policy)* task can change it's policy. The system default policy requires no * such protection. */ -unsigned slab_node (struct mempolicy *policy) +unsigned slab_node (void ) { +struct mempolicy *policy; + +if (in_interrupt ()) +return numa_node_id (); + + policy = current->mempolicy;if (!policy || policy->flags &MPOL_F_LOCAL )return numa_node_id ();
mm/slab.c +2 -2
@@ -3336,7 +3336,7 @@ static void *alternate_node_alloc(struct kmem_cache *cachep, gfp_t flags)if (cpuset_do_slab_mem_spread () && (cachep->flags &SLAB_MEM_SPREAD )) nid_alloc =cpuset_slab_spread_node ();else if (current->mempolicy) - nid_alloc =slab_node (current->mempolicy); + nid_alloc =slab_node ();if (nid_alloc != nid_here)return ____cache_alloc_node (cachep, flags, nid_alloc);return NULL ;
@@ -3368,7 +3368,7 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags) retry_cpuset: cpuset_mems_cookie =get_mems_allowed (); - zonelist =node_zonelist (slab_node (current->mempolicy), flags); + zonelist =node_zonelist (slab_node (), flags); retry:/*
mm/slub.c +1 -1
@@ -1617,7 +1617,7 @@ static struct page *get_any_partial(struct kmem_cache *s, gfp_t flags, do { cpuset_mems_cookie = get_mems_allowed(); - zonelist = node_zonelist(slab_node(current->mempolicy), flags); + zonelist = node_zonelist(slab_node(), flags); for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) { struct kmem_cache_node *n;
Signature · 1 line
1.7.9.5
PATCH 39/45 8250_pci: fix warnings in backport of Broadcom TruManage support
In reply to Zefan LiFrom: Paul Gortmaker <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 7400ce7ee9595432b2a1402b6ffcac9faf38d9ae (v3.4.92-76-g7400ce7ee959) was a backport of commit ebebd49a8eab5e9aa1b1f8f1614ccc3c2120f886 upstream ("8250/16?50: Add support for Broadcom TruManage redirected serial port")
However, in the context of 3.4.x kernels, the pci setup code was expecting a struct uart_port and not a struct uart_8250_port, leading to the following concerning warnings:
drivers/tty/serial/8250/8250_pci.c: In function ‘pci_brcm_trumanage_setup’:drivers/tty/serial/8250/8250_pci.c:1086:2: warning: passing argument 3 of ‘pci_default_setup’ from incompatible pointer type [enabled by default]
int ret = pci_default_setup(priv, board, port, idx);
^drivers/tty/serial/8250/8250_pci.c:1036:1: note: expected ‘struct uart_port *’ but argument is of type ‘struct uart_8250_port *’
pci_default_setup(struct serial_private *priv,
^drivers/tty/serial/8250/8250_pci.c: At top level:drivers/tty/serial/8250/8250_pci.c:1746:3: warning: initialization from incompatible pointer type [enabled by default]
.setup = pci_brcm_trumanage_setup,
^drivers/tty/serial/8250/8250_pci.c:1746:3: warning: (near initialization for ‘pci_serial_quirks[56].setup’) [enabled by default]
I'd also expect the initialization to not function correctly, and perhaps dereference random garbage due to this. Since the uart_port is a field within the uart_8250_port, the adaptation to fix these warnings is a straightforward removal of a layer of indirection.
--- drivers/tty/serial/8250/8250_pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/serial/8250/8250_pci.c +3 -3
@@ -1080,12 +1080,12 @@ pci_omegapci_setup(struct serial_private *priv,static int pci_brcm_trumanage_setup (struct serial_private *priv,const struct pciserial_board *board, -struct uart_8250_port *port,int idx) +struct uart_port *port,int idx) {int ret =pci_default_setup (priv, board, port, idx); - port->port.type =PORT_BRCM_TRUMANAGE ; - port->port.flags = (port->port.flags |UPF_FIXED_PORT |UPF_FIXED_TYPE ); + port->type =PORT_BRCM_TRUMANAGE ; + port->flags = (port->flags |UPF_FIXED_PORT |UPF_FIXED_TYPE );return ret; }
Signature · 1 line
1.7.9.5
PATCH 40/45 unicore32: select generic atomic64_t support
In reply to Zefan LiFrom: Fengguang Wu <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 82e54a6aaf8aec971fb16afa3a4404e238a1b98b upstream.
It's required for the core fs/namespace.c and many other basic features.
--- arch/unicore32/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/unicore32/Kconfig +1 -0
@@ -6,6 +6,7 @@ config UNICORE32 select HAVE_DMA_ATTRS select HAVE_KERNEL_GZIP select HAVE_KERNEL_BZIP2 + select GENERIC_ATOMIC64 select HAVE_KERNEL_LZO select HAVE_KERNEL_LZMA select GENERIC_FIND_FIRST_BIT
Signature · 1 line
1.7.9.5
PATCH 41/45 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler
In reply to Zefan LiFrom: Guan Xuetao <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 10e1e99e55378a65529c48753703c069aebce7af upstream.
For kernel/bound.c being compiled by native compiler, it will generate following errors in gcc 4.4.3:
CC kernel/bounds.s
In file included from include/linux/bug.h:4,
from include/linux/page-flags.h:9,
from kernel/bounds.c:9:arch/unicore32/include/asm/bug.h:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void' arch/unicore32/include/asm/bug.h:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
So, we moved definitions in asm/bug.h to arch/unicore32/kernel/setup.h to solve the problem.
--- arch/unicore32/include/asm/bug.h | 5 ----- arch/unicore32/kernel/setup.h | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-)
arch/unicore32/include/asm/bug.h +0 -5
@@ -19,9 +19,4 @@ extern void die(const char *msg, struct pt_regs *regs, int err);extern void uc32_notify_die (const char *str,struct pt_regs *regs,struct siginfo *info,unsigned long err,unsigned long trap); -extern asmlinkage void __backtrace(void); -extern asmlinkage void c_backtrace(unsigned long fp, int pmode); - -extern void __show_regs (struct pt_regs *); -#endif /* __UNICORE_BUG_H__ */
arch/unicore32/kernel/setup.h +6 -0
@@ -30,4 +30,10 @@ extern char __vectors_start[], __vectors_end[];extern void kernel_thread_helper (void );extern void __init early_signal_init (void ); + +extern asmlinkage void __backtrace(void); +extern asmlinkage void c_backtrace(unsigned long fp, int pmode); + +extern void __show_regs (struct pt_regs *); +#endif
Signature · 1 line
1.7.9.5
PATCH 42/45 UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer
In reply to Zefan LiFrom: Guan Xuetao <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 195d4577d1d7ab1f0398b3190547c116b56f435f upstream.
When disintegrate system.h, I left an error in asm/cmpxchg.h, which will result in following error:
arch/unicore32/include/asm/cmpxchg.h: In function '__xchg':arch/unicore32/include/asm/cmpxchg.h:38: error: void value not ignored as it ought to be
--- arch/unicore32/include/asm/cmpxchg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/unicore32/include/asm/cmpxchg.h +1 -1
@@ -35,7 +35,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, : "memory", "cc");break ;default : - ret =__xchg_bad_pointer (); +__xchg_bad_pointer (); }return ret;
Signature · 1 line
1.7.9.5
PATCH 43/45 alpha: Fix fall-out from disintegrating asm/system.h
In reply to Zefan LiFrom: Michael Cree <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit d1b5153f3ec83789b71d64efaf2a880c8fe6358e upstream.
Commit ec2212088c42 ("Disintegrate asm/system.h for Alpha") removed asm/system.h however arch/alpha/oprofile/common.c requires definitions that were shifted from asm/system.h to asm/special_insns.h. Include that.
--- arch/alpha/oprofile/common.c | 1 + 1 file changed, 1 insertion(+)
arch/alpha/oprofile/common.c +1 -0
@@ -12,6 +12,7 @@#include <linux/smp.h> #include <linux/errno.h> #include <asm/ptrace.h> +#include <asm/special_insns.h> #include "op_impl.h"
Signature · 1 line
1.7.9.5
PATCH 44/45 ext2: Fix fs corruption in ext2_get_xip_mem()
In reply to Zefan LiFrom: Jan Kara <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 7ba3ec5749ddb61f79f7be17b5fd7720eebc52de upstream.
Commit 8e3dffc651cb "Ext2: mark inode dirty after the function dquot_free_block_nodirty is called" unveiled a bug in __ext2_get_block() called from ext2_get_xip_mem(). That function called ext2_get_block() mistakenly asking it to map 0 blocks while 1 was intended. Before the above mentioned commit things worked out fine by luck but after that commit we started returning that we allocated 0 blocks while we in fact allocated 1 block and thus allocation was looping until all blocks in the filesystem were exhausted.
Fix the problem by properly asking for one block and also add assertion in ext2_get_blocks() to catch similar problems.
--- fs/ext2/inode.c | 2 ++ fs/ext2/xip.c | 1 + 2 files changed, 3 insertions(+)
fs/ext2/inode.c +2 -0
@@ -614,6 +614,8 @@ static int ext2_get_blocks(struct inode *inode,int count =0 ;ext2_fsblk_t first_block =0 ; +BUG_ON (maxblocks ==0 ); + depth =ext2_block_to_path (inode,iblock,offsets,&blocks_to_boundary);if (depth ==0 )
fs/ext2/xip.c +1 -0
@@ -35,6 +35,7 @@ __ext2_get_block(struct inode *inode, pgoff_t pgoff, int create,int rc;memset (&tmp,0 ,sizeof (struct buffer_head )); + tmp.b_size =1 << inode->i_blkbits; rc =ext2_get_block (inode, pgoff, &tmp, create); *result = tmp.b_blocknr;
Signature · 1 line
1.7.9.5
PATCH 45/45 alpha: add io{read,write}{16,32}be functions
In reply to Zefan LiFrom: Michael Cree <[email protected]>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 25534eb7707821b796fd84f7115367e02f36aa60 upstream.
These functions are used in some PCI drivers with big-endian MMIO space.
Admittedly it is almost certain that no one this side of the Moon would use such a card in an Alpha but it does get us closer to being able to build allyesconfig or allmodconfig, and it enables the Debian default generic config to build.
--- arch/alpha/include/asm/io.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/alpha/include/asm/io.h +5 -0
@@ -489,6 +489,11 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) }#endif +#define ioread16be (p) be16_to_cpu(ioread16(p)) +#define ioread32be (p) be32_to_cpu(ioread32(p)) +#define iowrite16be (v,p) iowrite16(cpu_to_be16(v), (p)) +#define iowrite32be (v,p) iowrite32(cpu_to_be32(v), (p)) +#define inb_p inb#define inw_p inw#define inl_p inl
Signature · 1 line
1.7.9.5
Quoted 10 lines · Zefan Li
From: Zefan Li <[email protected]>
This is the start of the stable review cycle for the 3.4.104 release. There are 45 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Sep 25 02:03:31 UTC 2014. Anything received after that time might be too late.
Quoted 6 lines
A combined patch relative to 3.4.103 will be posted as an additional response to this. A shortlog and diffstat can be found below.
thanks,
Zefan Li
Hi,
did you push the latest patch ? I only see 43 patches in the queue.
Thanks,
Guenter
Quoted 14 lines · Guenter Roeck
Quoted 13 lines · Zefan Li
From: Zefan Li <[email protected]>
This is the start of the stable review cycle for the 3.4.104 release. There are 45 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Sep 25 02:03:31 UTC 2014. Anything received after that time might be too late.
A combined patch relative to 3.4.103 will be posted as an additional response to this. A shortlog and diffstat can be found below.
Quoted 8 lines
Quoted 3 lines
thanks,
Zefan Li
Hi,
did you push the latest patch ? I only see 43 patches in the queue.
Never mind, got it now.
Guenter
Quoted 14 lines · Guenter Roeck
Quoted 13 lines · Zefan Li
From: Zefan Li <[email protected]>
This is the start of the stable review cycle for the 3.4.104 release. There are 45 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Sep 25 02:03:31 UTC 2014. Anything received after that time might be too late.
A combined patch relative to 3.4.103 will be posted as an additional response to this. A shortlog and diffstat can be found below.
Quoted 8 lines
Quoted 3 lines
thanks,
Zefan Li
Hi,
did you push the latest patch ? I only see 43 patches in the queue.
I just did. :)
This is the combined patch for 3.4.104-rc1 relative to 3.4.103.
---
Documentation/stable_kernel_rules.txt +3 -0
@@ -29,6 +29,9 @@ Rules on what kind of patches are accepted, and which ones are not, into the Procedure for submitting patches to the -stable tree: + - If the patch covers files in net/ or drivers/net please follow netdev stable + submission guidelines as described in + Documentation/networking/netdev-FAQ.txt - Send the patch, after verifying that it follows the above rules, to [email protected]. You must note the upstream commit ID in the changelog of your submission, as well as the kernel version you wish
Makefile +2 -2
@@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 103 -EXTRAVERSION = +SUBLEVEL = 104 +EXTRAVERSION = -rc1 NAME = Saber-toothed Squirrel # *DOCUMENTATION*
arch/alpha/include/asm/io.h +5 -0
@@ -489,6 +489,11 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) }#endif +#define ioread16be (p) be16_to_cpu(ioread16(p)) +#define ioread32be (p) be32_to_cpu(ioread32(p)) +#define iowrite16be (v,p) iowrite16(cpu_to_be16(v), (p)) +#define iowrite32be (v,p) iowrite32(cpu_to_be32(v), (p)) +#define inb_p inb#define inw_p inw#define inl_p inl
arch/alpha/oprofile/common.c +1 -0
@@ -12,6 +12,7 @@#include <linux/smp.h> #include <linux/errno.h> #include <asm/ptrace.h> +#include <asm/special_insns.h> #include "op_impl.h"
arch/arm/kernel/entry-header.S +15 -14
@@ -76,26 +76,21 @@ #ifndef CONFIG_THUMB2_KERNEL .macro svc_exit, rpsr msr spsr_cxsf, \rpsr -#if defined(CONFIG_CPU_V6) - ldr r0, [sp] - strex r1, r2, [sp] @ clear the exclusive monitor - ldmib sp, {r1 - pc}^ @ load r1 - pc, cpsr -#elif defined(CONFIG_CPU_32v6K) - clrex @ clear the exclusive monitor - ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr -#else - ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K) + @ We must avoid clrex due to Cortex-A15 erratum #830321 + sub r0, sp, #4 @ uninhabited address + strex r1, r2, [r0] @ clear the exclusive monitor #endif + ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr .endm .macro restore_user_regs, fast = 0, offset = 0 ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr ldr lr, [sp, #\offset + S_PC]! @ get pc msr spsr_cxsf, r1 @ save in spsr_svc -#if defined(CONFIG_CPU_V6) +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K) + @ We must avoid clrex due to Cortex-A15 erratum #830321 strex r1, r2, [sp] @ clear the exclusive monitor -#elif defined(CONFIG_CPU_32v6K) - clrex @ clear the exclusive monitor #endif .if \fast ldmdb sp, {r1 - lr}^ @ get calling r1 - lr
@@ -123,7 +118,10 @@ .macro svc_exit, rpsr ldr lr, [sp, #S_SP] @ top of the stack ldrd r0, r1, [sp, #S_LR] @ calling lr and pc - clrex @ clear the exclusive monitor + + @ We must avoid clrex due to Cortex-A15 erratum #830321 + strex r2, r1, [sp, #S_LR] @ clear the exclusive monitor + stmdb lr!, {r0, r1, \rpsr} @ calling lr and rfe context ldmia sp, {r0 - r12} mov sp, lr
@@ -132,13 +130,16 @@ .endm .macro restore_user_regs, fast = 0, offset = 0 - clrex @ clear the exclusive monitor mov r2, sp load_user_sp_lr r2, r3, \offset + S_SP @ calling sp, lr ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr ldr lr, [sp, #\offset + S_PC] @ get pc add sp, sp, #\offset + S_SP msr spsr_cxsf, r1 @ save in spsr_svc + + @ We must avoid clrex due to Cortex-A15 erratum #830321 + strex r1, r2, [sp] @ clear the exclusive monitor + .if \fast ldmdb sp, {r1 - r12} @ get calling r1 - r12 .else
arch/arm/mm/abort-ev6.S +0 -6
@@ -17,12 +17,6 @@ */ .align 5 ENTRY(v6_early_abort) -#ifdef CONFIG_CPU_V6 - sub r1, sp, #4 @ Get unused stack location - strex r0, r1, [r1] @ Clear the exclusive monitor -#elif defined(CONFIG_CPU_32v6K) - clrex -#endif mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR /*
arch/arm/mm/abort-ev7.S +0 -6
@@ -13,12 +13,6 @@ */ .align 5 ENTRY(v7_early_abort) - /* - * The effect of data aborts on on the exclusive access monitor are - * UNPREDICTABLE. Do a CLREX to clear the state - */ - clrex - mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR
arch/mips/cavium-octeon/setup.c +13 -5
@@ -265,6 +265,18 @@ static irqreturn_t octeon_rlm_interrupt(int cpl, void *dev_id) }#endif +static char __read_mostly octeon_system_type[80 ]; + +static int __init init_octeon_system_type (void ) +{ +snprintf (octeon_system_type,sizeof (octeon_system_type),"%s (%s)" , +cvmx_board_type_to_string (octeon_bootinfo->board_type), +octeon_model_get_string (read_c0_prid ())); + +return 0 ; +} +early_initcall (init_octeon_system_type); +/** * Return a string representing the system type *
@@ -272,11 +284,7 @@ static irqreturn_t octeon_rlm_interrupt(int cpl, void *dev_id)*/ const char *octeon_board_type_string (void ) { -static char name[80 ]; -sprintf (name,"%s (%s)" , -cvmx_board_type_to_string (octeon_bootinfo->board_type), -octeon_model_get_string (read_c0_prid ())); -return name; +return octeon_system_type; }const char *get_system_type (void )
arch/mips/kernel/perf_event_mipsxx.c +0 -5
@@ -162,11 +162,6 @@ static unsigned int counters_total_to_per_cpu(unsigned int counters) return counters >> vpe_shift(); } -static unsigned int counters_per_cpu_to_total (unsigned int counters) -{ -return counters <<vpe_shift (); -} -#else /* !CONFIG_MIPS_MT_SMP */ #define vpe_id () 0
arch/mips/mm/c-r4k.c +5 -0
@@ -12,6 +12,7 @@#include <linux/highmem.h> #include <linux/kernel.h> #include <linux/linkage.h> +#include <linux/preempt.h> #include <linux/sched.h> #include <linux/smp.h> #include <linux/mm.h>
@@ -598,6 +599,7 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size)/* Catch bad driver code */ BUG_ON (size ==0 ); +preempt_disable ();if (cpu_has_inclusive_pcaches) {if (size >= scache_size)r4k_blast_scache ();
@@ -618,6 +620,7 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size)R4600_HIT_CACHEOP_WAR_IMPL ;blast_dcache_range (addr, addr + size); } +preempt_enable ();bc_wback_inv (addr, size);__sync ();
@@ -628,6 +631,7 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size)/* Catch bad driver code */ BUG_ON (size ==0 ); +preempt_disable ();if (cpu_has_inclusive_pcaches) {if (size >= scache_size)r4k_blast_scache ();
@@ -663,6 +667,7 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size)cache_op (Hit_Writeback_Inv_D, (addr + size -1 ) & almask);blast_inv_dcache_range (addr, addr + size); } +preempt_enable ();bc_inv (addr, size);__sync ();
arch/openrisc/kernel/head.S +1 -0
@@ -19,6 +19,7 @@ #include <linux/threads.h> #include <linux/errno.h> #include <linux/init.h> +#include <linux/serial_reg.h> #include <asm/processor.h> #include <asm/page.h> #include <asm/mmu.h>
arch/unicore32/Kconfig +1 -0
@@ -6,6 +6,7 @@ config UNICORE32 select HAVE_DMA_ATTRS select HAVE_KERNEL_GZIP select HAVE_KERNEL_BZIP2 + select GENERIC_ATOMIC64 select HAVE_KERNEL_LZO select HAVE_KERNEL_LZMA select GENERIC_FIND_FIRST_BIT
arch/unicore32/include/asm/bug.h +0 -5
@@ -19,9 +19,4 @@ extern void die(const char *msg, struct pt_regs *regs, int err);extern void uc32_notify_die (const char *str,struct pt_regs *regs,struct siginfo *info,unsigned long err,unsigned long trap); -extern asmlinkage void __backtrace(void); -extern asmlinkage void c_backtrace(unsigned long fp, int pmode); - -extern void __show_regs (struct pt_regs *); -#endif /* __UNICORE_BUG_H__ */
arch/unicore32/include/asm/cmpxchg.h +1 -1
@@ -35,7 +35,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, : "memory", "cc");break ;default : - ret =__xchg_bad_pointer (); +__xchg_bad_pointer (); }return ret;
arch/unicore32/kernel/setup.h +6 -0
@@ -30,4 +30,10 @@ extern char __vectors_start[], __vectors_end[];extern void kernel_thread_helper (void );extern void __init early_signal_init (void ); + +extern asmlinkage void __backtrace(void); +extern asmlinkage void c_backtrace(unsigned long fp, int pmode); + +extern void __show_regs (struct pt_regs *); +#endif
arch/xtensa/include/asm/ioctls.h +10 -9
@@ -28,17 +28,17 @@#define TCSETSW 0x5403#define TCSETSF 0x5404 -#define TCGETA _IOR('t', 23, struct termio) -#define TCSETA _IOW('t', 24, struct termio) -#define TCSETAW _IOW('t', 25, struct termio) -#define TCSETAF _IOW('t', 28, struct termio) +#define TCGETA 0x80127417/* _IOR('t', 23, struct termio) */ +#define TCSETA 0x40127418/* _IOW('t', 24, struct termio) */ +#define TCSETAW 0x40127419/* _IOW('t', 25, struct termio) */ +#define TCSETAF 0x4012741C/* _IOW('t', 28, struct termio) */ #define TCSBRK _IO('t', 29)#define TCXONC _IO('t', 30)#define TCFLSH _IO('t', 31) -#define TIOCSWINSZ _IOW('t', 103, struct winsize) -#define TIOCGWINSZ _IOR('t', 104, struct winsize) +#define TIOCSWINSZ 0x40087467/* _IOW('t', 103, struct winsize) */ +#define TIOCGWINSZ 0x80087468/* _IOR('t', 104, struct winsize) */ #define TIOCSTART _IO('t', 110)/* start output, like ^Q */ #define TIOCSTOP _IO('t', 111)/* stop output, like ^S */ #define TIOCOUTQ _IOR('t', 115, int)/* output queue size */
@@ -88,7 +88,6 @@#define TIOCSETD _IOW('T', 35, int)#define TIOCGETD _IOR('T', 36, int)#define TCSBRKP _IOW('T', 37, int)/* Needed for POSIX tcsendbreak()*/ -#define TIOCTTYGSTRUCT _IOR('T', 38, struct tty_struct)/* For debugging only*/ #define TIOCSBRK _IO('T', 39)/* BSD compatibility */ #define TIOCCBRK _IO('T', 40)/* BSD compatibility */ #define TIOCGSID _IOR('T', 41, pid_t)/* Return the session ID of FD*/
@@ -111,8 +110,10 @@#define TIOCSERGETLSR _IOR('T', 89, unsigned int)/* Get line status reg. */ /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ # define TIOCSER_TEMT 0x01/* Transmitter physically empty */ -#define TIOCSERGETMULTI _IOR('T', 90, struct serial_multiport_struct)/* Get multiport config */ -#define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct)/* Set multiport config */ +#define TIOCSERGETMULTI 0x80a8545a/* Get multiport config */ +/* _IOR('T', 90, struct serial_multiport_struct) */ +#define TIOCSERSETMULTI 0x40a8545b/* Set multiport config */ +/* _IOW('T', 91, struct serial_multiport_struct) */ #define TIOCMIWAIT _IO('T', 92)/* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */
arch/xtensa/include/asm/pgtable.h +6 -1
@@ -68,7 +68,12 @@#define VMALLOC_START 0xC0000000#define VMALLOC_END 0xC7FEFFFF#define TLBTEMP_BASE_1 0xC7FF0000 -#define TLBTEMP_BASE_2 0xC7FF8000 +#define TLBTEMP_BASE_2 (TLBTEMP_BASE_1 + DCACHE_WAY_SIZE) +#if 2 *DCACHE_WAY_SIZE >ICACHE_WAY_SIZE +#define TLBTEMP_SIZE (2 * DCACHE_WAY_SIZE) +#else +#define TLBTEMP_SIZE ICACHE_WAY_SIZE +#endif /* * Xtensa Linux config PTE layout (when present):
arch/xtensa/kernel/entry.S +6 -8
@@ -1053,9 +1053,8 @@ ENTRY(fast_syscall_xtensa) movi a7, 4 # sizeof(unsigned int) access_ok a3, a7, a0, a2, .Leac # a0: scratch reg, a2: sp - addi a6, a6, -1 # assuming SYS_XTENSA_ATOMIC_SET = 1 - _bgeui a6, SYS_XTENSA_COUNT - 1, .Lill - _bnei a6, SYS_XTENSA_ATOMIC_CMP_SWP - 1, .Lnswp + _bgeui a6, SYS_XTENSA_COUNT, .Lill + _bnei a6, SYS_XTENSA_ATOMIC_CMP_SWP, .Lnswp /* Fall through for ATOMIC_CMP_SWP. */
@@ -1067,27 +1066,26 @@ TRY s32i a5, a3, 0 # different, modify value l32i a7, a2, PT_AREG7 # restore a7 l32i a0, a2, PT_AREG0 # restore a0 movi a2, 1 # and return 1 - addi a6, a6, 1 # restore a6 (really necessary?) rfe 1: l32i a7, a2, PT_AREG7 # restore a7 l32i a0, a2, PT_AREG0 # restore a0 movi a2, 0 # return 0 (note that we cannot set - addi a6, a6, 1 # restore a6 (really necessary?) rfe .Lnswp: /* Atomic set, add, and exg_add. */ TRY l32i a7, a3, 0 # orig + addi a6, a6, -SYS_XTENSA_ATOMIC_SET add a0, a4, a7 # + arg moveqz a0, a4, a6 # set + addi a6, a6, SYS_XTENSA_ATOMIC_SET TRY s32i a0, a3, 0 # write new value mov a0, a2 mov a2, a7 l32i a7, a0, PT_AREG7 # restore a7 l32i a0, a0, PT_AREG0 # restore a0 - addi a6, a6, 1 # restore a6 (really necessary?) rfe CATCH
@@ -1096,7 +1094,7 @@ CATCH movi a2, -EFAULT rfe -.Lill: l32i a7, a2, PT_AREG0 # restore a7 +.Lill: l32i a7, a2, PT_AREG7 # restore a7 l32i a0, a2, PT_AREG0 # restore a0 movi a2, -EINVAL rfe
@@ -1629,7 +1627,7 @@ ENTRY(fast_second_level_miss) rsr a0, EXCVADDR bltu a0, a3, 2f - addi a1, a0, -(2 << (DCACHE_ALIAS_ORDER + PAGE_SHIFT)) + addi a1, a0, -TLBTEMP_SIZE bgeu a1, a3, 2f /* Check if we have to restore an ITLB mapping. */
arch/xtensa/kernel/pci-dma.c +6 -6
@@ -48,9 +48,8 @@ dma_alloc_coherent(struct device *dev,size_t size,dma_addr_t *handle,gfp_t flag)/* We currently don't support coherent memory outside KSEG */ -if (ret <XCHAL_KSEG_CACHED_VADDR - || ret >=XCHAL_KSEG_CACHED_VADDR +XCHAL_KSEG_SIZE ) -BUG (); +BUG_ON (ret <XCHAL_KSEG_CACHED_VADDR || + ret >XCHAL_KSEG_CACHED_VADDR +XCHAL_KSEG_SIZE -1 );if (ret !=0 ) {
@@ -66,10 +65,11 @@ dma_alloc_coherent(struct device *dev,size_t size,dma_addr_t *handle,gfp_t flag)void dma_free_coherent (struct device *hwdev,size_t size,void *vaddr,dma_addr_t dma_handle) { -long addr=(long )vaddr+XCHAL_KSEG_CACHED_VADDR -XCHAL_KSEG_BYPASS_VADDR ; +unsigned long addr = (unsigned long )vaddr + +XCHAL_KSEG_CACHED_VADDR -XCHAL_KSEG_BYPASS_VADDR ; -if (addr <0 || addr >=XCHAL_KSEG_SIZE ) -BUG (); +BUG_ON (addr <XCHAL_KSEG_CACHED_VADDR || + addr >XCHAL_KSEG_CACHED_VADDR +XCHAL_KSEG_SIZE -1 );free_pages (addr,get_order (size)); }
drivers/ata/pata_scc.c +7 -8
@@ -586,7 +586,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask,* Note: Original code is ata_bus_softreset(). */ -static unsigned int scc_bus_softreset (struct ata_port *ap,unsigned int devmask, +static int scc_bus_softreset (struct ata_port *ap,unsigned int devmask,unsigned long deadline) {struct ata_ioports *ioaddr = &ap->ioaddr;
@@ -600,9 +600,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask,udelay (20 );out_be32 (ioaddr->ctl_addr, ap->ctl); -scc_wait_after_reset (&ap->link, devmask, deadline); - -return 0 ; +return scc_wait_after_reset (&ap->link, devmask, deadline); }/**
@@ -619,7 +617,8 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes, {struct ata_port *ap = link->ap;unsigned int slave_possible = ap->flags &ATA_FLAG_SLAVE_POSS ; -unsigned int devmask =0 , err_mask; +unsigned int devmask =0 ; +int rc;u8 err;DPRINTK ("ENTER\n" );
@@ -635,9 +634,9 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes,/* issue bus reset */ DPRINTK ("about to softreset, devmask=%x\n" , devmask); - err_mask =scc_bus_softreset (ap, devmask, deadline); -if (err_mask) { -ata_port_err (ap,"SRST failed (err_mask=0x%x)\n" , err_mask); + rc =scc_bus_softreset (ap, devmask, deadline); +if (rc) { +ata_port_err (ap,"SRST failed (err_mask=0x%x)\n" , rc);return -EIO ; }
drivers/hid/hid-cherry.c +1 -1
@@ -29,7 +29,7 @@static __u8 *ch_report_fixup (struct hid_device *hdev,__u8 *rdesc,unsigned int *rsize) { -if (*rsize >=17 && rdesc[11 ] ==0x3c && rdesc[12 ] ==0x02 ) { +if (*rsize >=18 && rdesc[11 ] ==0x3c && rdesc[12 ] ==0x02 ) {hid_info (hdev,"fixing up Cherry Cymotion report descriptor\n" ); rdesc[11 ] = rdesc[16 ] =0xff ; rdesc[12 ] = rdesc[17 ] =0x03 ;
drivers/hid/hid-kye.c +1 -1
@@ -282,7 +282,7 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,* - change the button usage range to 4-7 for the extra * buttons */ - if (*rsize >= 74 && + if (*rsize >= 75 && rdesc[61] == 0x05 && rdesc[62] == 0x08 && rdesc[63] == 0x19 && rdesc[64] == 0x08 && rdesc[65] == 0x29 && rdesc[66] == 0x0f &&
drivers/hid/hid-lg.c +2 -2
@@ -111,7 +111,7 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc, {unsigned long quirks = (unsigned long )hid_get_drvdata (hdev); -if ((quirks &LG_RDESC ) && *rsize >=90 && rdesc[83 ] ==0x26 && +if ((quirks &LG_RDESC ) && *rsize >=91 && rdesc[83 ] ==0x26 && rdesc[84 ] ==0x8c && rdesc[85 ] ==0x02 ) {hid_info (hdev,"fixing up Logitech keyboard report descriptor\n" );
@@ -120,7 +120,7 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc, }if ((quirks &LG_RDESC_REL_ABS ) && *rsize >=50 && rdesc[32 ] ==0x81 && rdesc[33 ] ==0x06 && - rdesc[49 ] ==0x81 && rdesc[50 ] ==0x06 ) { + rdesc[49 ] ==0x81 && rdesc[51 ] ==0x06 ) {hid_info (hdev,"fixing up rel/abs in Logitech report descriptor\n" ); rdesc[33 ] = rdesc[50 ] =0x02 ;
drivers/hid/hid-logitech-dj.c +30 -24
77 lines not on this page · raw message
drivers/hid/hid-logitech-dj.h +1 -0
@@ -27,6 +27,7 @@#define DJ_MAX_PAIRED_DEVICES 6#define DJ_MAX_NUMBER_NOTIFICATIONS 8 +#define DJ_RECEIVER_INDEX 0#define DJ_DEVICE_INDEX_MIN 1#define DJ_DEVICE_INDEX_MAX 6
drivers/hid/hid-magicmouse.c +10 -0
@@ -308,6 +308,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,if (size <4 || ((size -4 ) %9 ) !=0 )return 0 ; npoints = (size -4 ) /9 ; +if (npoints >15 ) { +hid_warn (hdev,"invalid size value (%d) for TRACKPAD_REPORT_ID\n" , + size); +return 0 ; + } msc->ntouches =0 ;for (ii =0 ; ii < npoints; ii++)magicmouse_emit_touch (msc, ii, data + ii *9 +4 );
@@ -331,6 +336,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,if (size <6 || ((size -6 ) %8 ) !=0 )return 0 ; npoints = (size -6 ) /8 ; +if (npoints >15 ) { +hid_warn (hdev,"invalid size value (%d) for MOUSE_REPORT_ID\n" , + size); +return 0 ; + } msc->ntouches =0 ;for (ii =0 ; ii < npoints; ii++)magicmouse_emit_touch (msc, ii, data + ii *8 +6 );
drivers/hid/hid-monterey.c +1 -1
@@ -25,7 +25,7 @@static __u8 *mr_report_fixup (struct hid_device *hdev,__u8 *rdesc,unsigned int *rsize) { -if (*rsize >=30 && rdesc[29 ] ==0x05 && rdesc[30 ] ==0x09 ) { +if (*rsize >=31 && rdesc[29 ] ==0x05 && rdesc[30 ] ==0x09 ) {hid_info (hdev,"fixing up button/consumer in HID report descriptor\n" ); rdesc[30 ] =0x0c ; }
drivers/hid/hid-petalynx.c +1 -1
@@ -26,7 +26,7 @@static __u8 *pl_report_fixup (struct hid_device *hdev,__u8 *rdesc,unsigned int *rsize) { -if (*rsize >=60 && rdesc[39 ] ==0x2a && rdesc[40 ] ==0xf5 && +if (*rsize >=62 && rdesc[39 ] ==0x2a && rdesc[40 ] ==0xf5 && rdesc[41 ] ==0x00 && rdesc[59 ] ==0x26 && rdesc[60 ] ==0xf9 && rdesc[61 ] ==0x00 ) {hid_info (hdev,"fixing up Petalynx Maxter Remote report descriptor\n" );
drivers/hid/hid-picolcd.c +6 -0
@@ -2370,6 +2370,12 @@ static int picolcd_raw_event(struct hid_device *hdev,if (!data)return 1 ; +if (size >64 ) { +hid_warn (hdev,"invalid size value (%d) for picolcd raw event\n" , + size); +return 0 ; + } +if (report->id ==REPORT_KEY_STATE ) {if (data->input_keys) ret =picolcd_raw_keypad (data, report, raw_data+1 , size-1 );
drivers/hid/hid-sunplus.c +1 -1
@@ -25,7 +25,7 @@static __u8 *sp_report_fixup (struct hid_device *hdev,__u8 *rdesc,unsigned int *rsize) { -if (*rsize >=107 && rdesc[104 ] ==0x26 && rdesc[105 ] ==0x80 && +if (*rsize >=112 && rdesc[104 ] ==0x26 && rdesc[105 ] ==0x80 && rdesc[106 ] ==0x03 ) {hid_info (hdev,"fixing up Sunplus Wireless Desktop report descriptor\n" ); rdesc[105 ] = rdesc[110 ] =0x03 ;
drivers/iommu/amd_iommu.c +6 -4
@@ -3028,14 +3028,16 @@ free_domains:static void cleanup_domain (struct protection_domain *domain) { -struct iommu_dev_data *dev_data, *next; +struct iommu_dev_data *entry;unsigned long flags;write_lock_irqsave (&amd_iommu_devtable_lock, flags); -list_for_each_entry_safe (dev_data, next, &domain->dev_list, list) { -__detach_device (dev_data); -atomic_set (&dev_data->bind,0 ); +while (!list_empty (&domain->dev_list)) { + entry =list_first_entry (&domain->dev_list, + struct iommu_dev_data, list); +__detach_device (entry); +atomic_set (&entry->bind,0 ); }write_unlock_irqrestore (&amd_iommu_devtable_lock, flags);
drivers/md/raid5.c +2 -0
@@ -3433,6 +3433,8 @@ static void handle_stripe(struct stripe_head *sh)set_bit (R5_Wantwrite, &dev->flags);if (prexor)continue ; +if (s.failed >1 ) +continue ;if (!test_bit (R5_Insync, &dev->flags) || ((i == sh->pd_idx || i == sh->qd_idx) && s.failed ==0 ))
drivers/net/ethernet/ibm/ibmveth.c +14 -4
@@ -293,6 +293,18 @@ failure:atomic_add (buffers_added, &(pool->available)); } +/* +* The final 8 bytes of the buffer list is a counter of frames dropped +* because there was not a buffer in the buffer list capable of holding +* the frame. +*/ +static void ibmveth_update_rx_no_buffer (struct ibmveth_adapter *adapter) +{ +__be64 *p = adapter->buffer_list_addr +4096 -8 ; + + adapter->rx_no_buffer =be64_to_cpup (p); +} +/* replenish routine */ static void ibmveth_replenish_task (struct ibmveth_adapter *adapter) {
@@ -308,8 +320,7 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter)ibmveth_replenish_buffer_pool (adapter, pool); } - adapter->rx_no_buffer = *(u64 *)(((char *)adapter->buffer_list_addr) + -4096 -8 ); +ibmveth_update_rx_no_buffer (adapter); }/* empty and free ana buffer pool - also used to do cleanup in error paths */
@@ -692,8 +703,7 @@ static int ibmveth_close(struct net_device *netdev)free_irq (netdev->irq, netdev); - adapter->rx_no_buffer = *(u64 *)(((char *)adapter->buffer_list_addr) + -4096 -8 ); +ibmveth_update_rx_no_buffer (adapter);ibmveth_cleanup (adapter);
drivers/staging/et131x/et131x.c +34 -44
180 lines not on this page · raw message
drivers/tty/serial/8250/8250_pci.c +3 -3
@@ -1080,12 +1080,12 @@ pci_omegapci_setup(struct serial_private *priv,static int pci_brcm_trumanage_setup (struct serial_private *priv,const struct pciserial_board *board, -struct uart_8250_port *port,int idx) +struct uart_port *port,int idx) {int ret =pci_default_setup (priv, board, port, idx); - port->port.type =PORT_BRCM_TRUMANAGE ; - port->port.flags = (port->port.flags |UPF_FIXED_PORT |UPF_FIXED_TYPE ); + port->type =PORT_BRCM_TRUMANAGE ; + port->flags = (port->flags |UPF_FIXED_PORT |UPF_FIXED_TYPE );return ret; }
drivers/usb/host/xhci-pci.c +4 -0
@@ -98,6 +98,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)/* AMD PLL quirk */ if (pdev->vendor ==PCI_VENDOR_ID_AMD &&usb_amd_find_chipset_info ()) xhci->quirks |=XHCI_AMD_PLL_FIX ; + +if (pdev->vendor ==PCI_VENDOR_ID_AMD ) + xhci->quirks |=XHCI_TRUST_TX_LENGTH ; +if (pdev->vendor ==PCI_VENDOR_ID_INTEL && pdev->device ==PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI ) { xhci->quirks |=XHCI_EP_LIMIT_QUIRK ;
drivers/usb/host/xhci-ring.c +2 -1
@@ -2528,7 +2528,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,* last TRB of the previous TD. The command completion handle * will take care the rest. */ -if (!event_seg && trb_comp_code ==COMP_STOP_INVAL ) { +if (!event_seg && (trb_comp_code ==COMP_STOP || + trb_comp_code ==COMP_STOP_INVAL )) { ret =0 ; goto cleanup; }
drivers/usb/misc/sisusbvga/sisusb.c +1 -0
@@ -3248,6 +3248,7 @@ static const struct usb_device_id sisusb_table[] = { { USB_DEVICE(0x0711, 0x0918) }, { USB_DEVICE(0x0711, 0x0920) }, { USB_DEVICE(0x0711, 0x0950) }, + { USB_DEVICE(0x0711, 0x5200) }, { USB_DEVICE(0x182d, 0x021c) }, { USB_DEVICE(0x182d, 0x0269) }, { }
drivers/usb/serial/ftdi_sio.c +3 -0
@@ -162,6 +162,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) }, { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) }, { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_BM_ATOM_NANO_PID) }, { USB_DEVICE(FTDI_VID, FTDI_NXTCAM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_EV3CON_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) },
@@ -956,6 +957,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) }, { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) }, { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) }, +/* ekey Devices */ + { USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +7 -0
@@ -42,6 +42,8 @@/* www.candapter.com Ewert Energy Systems CANdapter device */ #define FTDI_CANDAPTER_PID 0x9F80/* Product Id */ +#define FTDI_BM_ATOM_NANO_PID 0xa559/* Basic Micro ATOM Nano USB2Serial */ +/* * Texas Instruments XDS100v2 JTAG / BeagleBone A3 * http://processors.wiki.ti.com/index.php/XDS100
@@ -1369,3 +1371,8 @@#define BRAINBOXES_US_160_6_PID 0x9006/* US-160 16xRS232 1Mbaud Port 11 and 12 */ #define BRAINBOXES_US_160_7_PID 0x9007/* US-160 16xRS232 1Mbaud Port 13 and 14 */ #define BRAINBOXES_US_160_8_PID 0x9008/* US-160 16xRS232 1Mbaud Port 15 and 16 */ + +/* +* ekey biometric systems GmbH (http://ekey.net/) +*/ +#define FTDI_EKEY_CONV_USB_PID 0xCB08/* Converter USB */
drivers/usb/serial/option.c +5 -0
@@ -499,6 +499,10 @@ static void option_instat_callback(struct urb *urb);#define INOVIA_VENDOR_ID 0x20a6#define INOVIA_SEW858 0x1105 +/* VIA Telecom */ +#define VIATELECOM_VENDOR_ID 0x15eb +#define VIATELECOM_PRODUCT_CDS7 0x0001 +/* some devices interfaces need special handling due to a number of reasons */ enum option_blacklist_reason {OPTION_BLACKLIST_NONE =0 ,
@@ -1744,6 +1748,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ { USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) }, + { USB_DEVICE(VIATELECOM_VENDOR_ID, VIATELECOM_PRODUCT_CDS7) }, { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, option_ids);
drivers/usb/serial/pl2303.c +1 -0
@@ -51,6 +51,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GPRS) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_HCR331) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MOTOROLA) }, + { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ZTEK) }, { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) }, { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) }, { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
drivers/usb/serial/pl2303.h +1 -0
@@ -22,6 +22,7 @@#define PL2303_PRODUCT_ID_GPRS 0x0609#define PL2303_PRODUCT_ID_HCR331 0x331a#define PL2303_PRODUCT_ID_MOTOROLA 0x0307 +#define PL2303_PRODUCT_ID_ZTEK 0xe1f1#define ATEN_VENDOR_ID 0x0557#define ATEN_VENDOR_ID2 0x0547
drivers/usb/serial/usb-serial.c +25 -10
@@ -794,29 +794,37 @@ int usb_serial_probe(struct usb_interface *interface,if (usb_endpoint_is_bulk_in (endpoint)) {/* we found a bulk in endpoint */ dbg ("found bulk in on endpoint %d" , i); - bulk_in_endpoint[num_bulk_in] = endpoint; - ++num_bulk_in; +if (num_bulk_in <MAX_NUM_PORTS ) { + bulk_in_endpoint[num_bulk_in] = endpoint; + ++num_bulk_in; + } }if (usb_endpoint_is_bulk_out (endpoint)) {/* we found a bulk out endpoint */ dbg ("found bulk out on endpoint %d" , i); - bulk_out_endpoint[num_bulk_out] = endpoint; - ++num_bulk_out; +if (num_bulk_out <MAX_NUM_PORTS ) { + bulk_out_endpoint[num_bulk_out] = endpoint; + ++num_bulk_out; + } }if (usb_endpoint_is_int_in (endpoint)) {/* we found a interrupt in endpoint */ dbg ("found interrupt in on endpoint %d" , i); - interrupt_in_endpoint[num_interrupt_in] = endpoint; - ++num_interrupt_in; +if (num_interrupt_in <MAX_NUM_PORTS ) { + interrupt_in_endpoint[num_interrupt_in] = endpoint; + ++num_interrupt_in; + } }if (usb_endpoint_is_int_out (endpoint)) {/* we found an interrupt out endpoint */ dbg ("found interrupt out on endpoint %d" , i); - interrupt_out_endpoint[num_interrupt_out] = endpoint; - ++num_interrupt_out; +if (num_interrupt_out <MAX_NUM_PORTS ) { + interrupt_out_endpoint[num_interrupt_out] = endpoint; + ++num_interrupt_out; + } } }
@@ -839,8 +847,10 @@ int usb_serial_probe(struct usb_interface *interface,if (usb_endpoint_is_int_in (endpoint)) {/* we found a interrupt in endpoint */ dbg ("found interrupt in for Prolific device on separate interface" ); - interrupt_in_endpoint[num_interrupt_in] = endpoint; - ++num_interrupt_in; +if (num_interrupt_in <MAX_NUM_PORTS ) { + interrupt_in_endpoint[num_interrupt_in] = endpoint; + ++num_interrupt_in; + } } } }
@@ -879,6 +889,11 @@ int usb_serial_probe(struct usb_interface *interface, num_ports = type->num_ports; } +if (num_ports >MAX_NUM_PORTS ) { +dev_warn (&interface->dev,"too many ports requested: %d\n" , num_ports); + num_ports =MAX_NUM_PORTS ; + } + serial->num_ports = num_ports; serial->num_bulk_in = num_bulk_in; serial->num_bulk_out = num_bulk_out;
drivers/usb/serial/whiteheat.c +6 -1
@@ -953,6 +953,10 @@ static void command_port_read_callback(struct urb *urb)dbg ("%s - command_info is NULL, exiting." , __func__);return ; } +if (!urb->actual_length) { +dev_dbg (&urb->dev->dev,"%s - empty response, exiting.\n" , __func__); +return ; + }if (status) {dbg ("%s - nonzero urb status: %d" , __func__, status);if (status != -ENOENT )
@@ -974,7 +978,8 @@ static void command_port_read_callback(struct urb *urb)/* These are unsolicited reports from the firmware, hence no waiting command to wakeup */ dbg ("%s - event received" , __func__); - }else if (data[0 ] ==WHITEHEAT_GET_DTR_RTS ) { + }else if ((data[0 ] ==WHITEHEAT_GET_DTR_RTS ) && + (urb->actual_length -1 <=sizeof (command_info->result_buffer))) {memcpy (command_info->result_buffer, &data[1 ], urb->actual_length -1 ); command_info->command_finished =WHITEHEAT_CMD_COMPLETE ;
fs/cifs/inode.c +6 -0
@@ -1653,6 +1653,12 @@ unlink_target: target_dentry, toName); } +/* force revalidate to go get info when needed */ +CIFS_I (source_dir)->time =CIFS_I (target_dir)->time =0 ; + + source_dir->i_ctime = source_dir->i_mtime = target_dir->i_ctime = + target_dir->i_mtime =current_fs_time (source_dir->i_sb); + cifs_rename_exit:kfree (info_buf_source);kfree (fromName);
fs/ext2/inode.c +2 -0
@@ -614,6 +614,8 @@ static int ext2_get_blocks(struct inode *inode,int count =0 ;ext2_fsblk_t first_block =0 ; +BUG_ON (maxblocks ==0 ); + depth =ext2_block_to_path (inode,iblock,offsets,&blocks_to_boundary);if (depth ==0 )
fs/ext2/xip.c +1 -0
@@ -35,6 +35,7 @@ __ext2_get_block(struct inode *inode, pgoff_t pgoff, int create,int rc;memset (&tmp,0 ,sizeof (struct buffer_head )); + tmp.b_size =1 << inode->i_blkbits; rc =ext2_get_block (inode, pgoff, &tmp, create); *result = tmp.b_blocknr;
fs/isofs/inode.c +8 -7
@@ -68,7 +68,7 @@ static void isofs_put_super(struct super_block *sb)return ; } -static int isofs_read_inode (struct inode *); +static int isofs_read_inode (struct inode *,int relocated);static int isofs_statfs (struct dentry *,struct kstatfs *);static struct kmem_cache *isofs_inode_cachep;
@@ -1264,7 +1264,7 @@ out_toomany: goto out; } -static int isofs_read_inode (struct inode *inode) +static int isofs_read_inode (struct inode *inode,int relocated) {struct super_block *sb = inode->i_sb;struct isofs_sb_info *sbi =ISOFS_SB (sb);
@@ -1409,7 +1409,7 @@ static int isofs_read_inode(struct inode *inode)*/ if (!high_sierra) { -parse_rock_ridge_inode (de, inode); +parse_rock_ridge_inode (de, inode, relocated);/* if we want uid/gid set, override the rock ridge setting */ if (sbi->s_uid_set) inode->i_uid = sbi->s_uid;
@@ -1488,9 +1488,10 @@ static int isofs_iget5_set(struct inode *ino, void *data)* offset that point to the underlying meta-data for the inode. The * code below is otherwise similar to the iget() code in * include/linux/fs.h */ -struct inode *isofs_iget (struct super_block *sb, -unsigned long block, -unsigned long offset) +struct inode *__isofs_iget (struct super_block *sb, +unsigned long block, +unsigned long offset, +int relocated) {unsigned long hashval;struct inode *inode;
@@ -1512,7 +1513,7 @@ struct inode *isofs_iget(struct super_block *sb,return ERR_PTR (-ENOMEM );if (inode->i_state &I_NEW ) { - ret =isofs_read_inode (inode); + ret =isofs_read_inode (inode, relocated);if (ret <0 ) {iget_failed (inode); inode =ERR_PTR (ret);
fs/isofs/isofs.h +19 -4
@@ -107,7 +107,7 @@ extern int iso_date(char *, int);struct inode ;/* To make gcc happy */ -extern int parse_rock_ridge_inode (struct iso_directory_record *,struct inode *); +extern int parse_rock_ridge_inode (struct iso_directory_record *,struct inode *,int relocated);extern int get_rock_ridge_filename (struct iso_directory_record *,char *,struct inode *);extern int isofs_name_translate (struct iso_directory_record *,char *,struct inode *);
@@ -118,9 +118,24 @@ extern struct dentry *isofs_lookup(struct inode *, struct dentry *, struct nameiextern struct buffer_head *isofs_bread (struct inode *,sector_t );extern int isofs_get_blocks (struct inode *,sector_t ,struct buffer_head **,unsigned long ); -extern struct inode *isofs_iget (struct super_block *sb, -unsigned long block, -unsigned long offset); +struct inode *__isofs_iget (struct super_block *sb, +unsigned long block, +unsigned long offset, +int relocated); + +static inline struct inode *isofs_iget (struct super_block *sb, +unsigned long block, +unsigned long offset) +{ +return __isofs_iget (sb, block, offset,0 ); +} + +static inline struct inode *isofs_iget_reloc (struct super_block *sb, +unsigned long block, +unsigned long offset) +{ +return __isofs_iget (sb, block, offset,1 ); +}/* Because the inode number is no longer relevant to finding the * underlying meta-data for an inode, we are free to choose a more
fs/isofs/rock.c +28 -11
@@ -288,12 +288,16 @@ eio: goto out; } +#define RR_REGARD_XA 1 +#define RR_RELOC_DE 2 +static int parse_rock_ridge_inode_internal (struct iso_directory_record *de, -struct inode *inode,int regard_xa) +struct inode *inode,int flags) {int symlink_len =0 ;int cnt, sig; +unsigned int reloc_block;struct inode *reloc;struct rock_ridge *rr;int rootflag;
@@ -305,7 +309,7 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de,init_rock_state (&rs, inode);setup_rock_ridge (de, inode, &rs); -if (regard_xa) { +if (flags &RR_REGARD_XA ) { rs.chr +=14 ; rs.len -=14 ;if (rs.len <0 )
@@ -485,12 +489,22 @@ repeat: "relocated directory\n"); goto out;case SIG ('C' ,'L' ): -ISOFS_I (inode)->i_first_extent = -isonum_733 (rr->u.CL.location); - reloc = -isofs_iget (inode->i_sb, -ISOFS_I (inode)->i_first_extent, -0 ); +if (flags &RR_RELOC_DE ) { +printk (KERN_ERR +"ISOFS: Recursive directory relocation " +"is not supported\n" ); + goto eio; + } + reloc_block =isonum_733 (rr->u.CL.location); +if (reloc_block ==ISOFS_I (inode)->i_iget5_block && +ISOFS_I (inode)->i_iget5_offset ==0 ) { +printk (KERN_ERR +"ISOFS: Directory relocation points to " +"itself\n" ); + goto eio; + } +ISOFS_I (inode)->i_first_extent = reloc_block; + reloc =isofs_iget_reloc (inode->i_sb, reloc_block,0 );if (IS_ERR (reloc)) { ret =PTR_ERR (reloc); goto out;
@@ -637,9 +651,11 @@ static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)return rpnt; } -int parse_rock_ridge_inode (struct iso_directory_record *de,struct inode *inode) +int parse_rock_ridge_inode (struct iso_directory_record *de,struct inode *inode, +int relocated) { -int result =parse_rock_ridge_inode_internal (de, inode,0 ); +int flags = relocated ?RR_RELOC_DE :0 ; +int result =parse_rock_ridge_inode_internal (de, inode, flags);/* * if rockridge flag was reset and we didn't look for attributes
@@ -647,7 +663,8 @@ int parse_rock_ridge_inode(struct iso_directory_record *de, struct inode *inode)*/ if ((ISOFS_SB (inode->i_sb)->s_rock_offset ==-1 ) && (ISOFS_SB (inode->i_sb)->s_rock ==2 )) { - result =parse_rock_ridge_inode_internal (de, inode,14 ); + result =parse_rock_ridge_inode_internal (de, inode, + flags |RR_REGARD_XA ); }return result; }
fs/nfs/nfs4proc.c +12 -5
@@ -2051,6 +2051,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) {struct nfs4_closedata *calldata = data;struct nfs4_state *state = calldata->state; +bool is_rdonly, is_wronly, is_rdwr;int call_close =0 ;dprintk ("%s: begin!\n" , __func__);
@@ -2058,18 +2059,24 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data)return ; task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OPEN_DOWNGRADE ]; - calldata->arg.fmode =FMODE_READ |FMODE_WRITE ;spin_lock (&state->owner->so_lock); + is_rdwr =test_bit (NFS_O_RDWR_STATE , &state->flags); + is_rdonly =test_bit (NFS_O_RDONLY_STATE , &state->flags); + is_wronly =test_bit (NFS_O_WRONLY_STATE , &state->flags); +/* Calculate the current open share mode */ + calldata->arg.fmode =0 ; +if (is_rdonly || is_rdwr) + calldata->arg.fmode |=FMODE_READ ; +if (is_wronly || is_rdwr) + calldata->arg.fmode |=FMODE_WRITE ;/* Calculate the change in open mode */ if (state->n_rdwr ==0 ) {if (state->n_rdonly ==0 ) { - call_close |=test_bit (NFS_O_RDONLY_STATE , &state->flags); - call_close |=test_bit (NFS_O_RDWR_STATE , &state->flags); + call_close |= is_rdonly || is_rdwr; calldata->arg.fmode &= ~FMODE_READ ; }if (state->n_wronly ==0 ) { - call_close |=test_bit (NFS_O_WRONLY_STATE , &state->flags); - call_close |=test_bit (NFS_O_RDWR_STATE , &state->flags); + call_close |= is_wronly || is_rdwr; calldata->arg.fmode &= ~FMODE_WRITE ; } }
include/linux/mempolicy.h +1 -1
@@ -205,7 +205,7 @@ extern struct zonelist *huge_zonelist(struct vm_area_struct *vma,extern bool init_nodemask_of_mempolicy (nodemask_t *mask);extern bool mempolicy_nodemask_intersects (struct task_struct *tsk,const nodemask_t *mask); -extern unsigned slab_node (struct mempolicy *policy); +extern unsigned slab_node (void );extern enum zone_type policy_zone;
mm/mempolicy.c +7 -1
@@ -1609,8 +1609,14 @@ static unsigned interleave_nodes(struct mempolicy *policy)* task can change it's policy. The system default policy requires no * such protection. */ -unsigned slab_node (struct mempolicy *policy) +unsigned slab_node (void ) { +struct mempolicy *policy; + +if (in_interrupt ()) +return numa_node_id (); + + policy = current->mempolicy;if (!policy || policy->flags &MPOL_F_LOCAL )return numa_node_id ();
mm/slab.c +2 -2
@@ -3336,7 +3336,7 @@ static void *alternate_node_alloc(struct kmem_cache *cachep, gfp_t flags)if (cpuset_do_slab_mem_spread () && (cachep->flags &SLAB_MEM_SPREAD )) nid_alloc =cpuset_slab_spread_node ();else if (current->mempolicy) - nid_alloc =slab_node (current->mempolicy); + nid_alloc =slab_node ();if (nid_alloc != nid_here)return ____cache_alloc_node (cachep, flags, nid_alloc);return NULL ;
@@ -3368,7 +3368,7 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags) retry_cpuset: cpuset_mems_cookie =get_mems_allowed (); - zonelist =node_zonelist (slab_node (current->mempolicy), flags); + zonelist =node_zonelist (slab_node (), flags); retry:/*
mm/slub.c +1 -1
@@ -1617,7 +1617,7 @@ static struct page *get_any_partial(struct kmem_cache *s, gfp_t flags, do { cpuset_mems_cookie = get_mems_allowed(); - zonelist = node_zonelist(slab_node(current->mempolicy), flags); + zonelist = node_zonelist(slab_node(), flags); for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) { struct kmem_cache_node *n;
sound/pci/hda/patch_realtek.c +12 -5
@@ -458,6 +458,8 @@ static void alc_fix_pll(struct hda_codec *codec) spec->pll_coef_idx); val =snd_hda_codec_read (codec, spec->pll_nid,0 ,AC_VERB_GET_PROC_COEF ,0 ); +if (val ==-1 ) +return ;snd_hda_codec_write (codec, spec->pll_nid,0 ,AC_VERB_SET_COEF_INDEX , spec->pll_coef_idx); snd_hda_codec_write(codec, spec->pll_nid, 0, AC_VERB_SET_PROC_COEF,
@@ -5843,6 +5845,8 @@ static int alc269_parse_auto_config(struct hda_codec *codec)static void alc269_toggle_power_output (struct hda_codec *codec,int power_up) {int val =alc_read_coef_idx (codec,0x04 ); +if (val ==-1 ) +return ;if (power_up) val |=1 <<11 ;else
@@ -6273,27 +6277,30 @@ static void alc269_fill_coef(struct hda_codec *codec)if ((alc_get_coef0 (codec) &0x00ff ) ==0x017 ) { val =alc_read_coef_idx (codec,0x04 );/* Power up output pin */ -alc_write_coef_idx (codec,0x04 , val | (1 <<11 )); +if (val !=-1 ) +alc_write_coef_idx (codec,0x04 , val | (1 <<11 )); }if ((alc_get_coef0 (codec) &0x00ff ) ==0x018 ) { val =alc_read_coef_idx (codec,0xd ); -if ((val &0x0c00 ) >>10 !=0x1 ) { +if (val !=-1 && (val &0x0c00 ) >>10 !=0x1 ) {/* Capless ramp up clock control */ alc_write_coef_idx (codec,0xd , val | (1 <<10 )); } val =alc_read_coef_idx (codec,0x17 ); -if ((val &0x01c0 ) >>6 !=0x4 ) { +if (val !=-1 && (val &0x01c0 ) >>6 !=0x4 ) {/* Class D power on reset */ alc_write_coef_idx (codec,0x17 , val | (1 <<7 )); } } val =alc_read_coef_idx (codec,0xd );/* Class D */ -alc_write_coef_idx (codec,0xd , val | (1 <<14 )); +if (val !=-1 ) +alc_write_coef_idx (codec,0xd , val | (1 <<14 )); val =alc_read_coef_idx (codec,0x4 );/* HP */ -alc_write_coef_idx (codec,0x4 , val | (1 <<11 )); +if (val !=-1 ) +alc_write_coef_idx (codec,0x4 , val | (1 <<11 )); }/*
sound/soc/pxa/pxa-ssp.c +1 -3
@@ -779,9 +779,7 @@ static int pxa_ssp_remove(struct snd_soc_dai *dai) SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | \ SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) -#define PXA_SSP_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ - SNDRV_PCM_FMTBIT_S24_LE | \ - SNDRV_PCM_FMTBIT_S32_LE) +#define PXA_SSP_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)static const struct snd_soc_dai_ops pxa_ssp_dai_ops = { .startup = pxa_ssp_startup,
virt/kvm/iommu.c +10 -9
@@ -61,6 +61,14 @@ static pfn_t kvm_pin_pages(struct kvm *kvm, struct kvm_memory_slot *slot,return pfn; } +static void kvm_unpin_pages (struct kvm *kvm,pfn_t pfn,unsigned long npages) +{ +unsigned long i; + +for (i =0 ; i < npages; ++i) +kvm_release_pfn_clean (pfn + i); +} +int kvm_iommu_map_pages (struct kvm *kvm,struct kvm_memory_slot *slot) {gfn_t gfn, end_gfn;
@@ -121,6 +129,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)if (r) {printk (KERN_ERR "kvm_iommu_map_address:" "iommu failed to map pfn=%llx\n" , pfn); +kvm_unpin_pages (kvm, pfn, page_size); goto unmap_pages; }
@@ -132,7 +141,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)return 0 ; unmap_pages: -kvm_iommu_put_pages (kvm, slot->base_gfn, gfn); +kvm_iommu_put_pages (kvm, slot->base_gfn, gfn - slot->base_gfn);return r; }
@@ -274,14 +283,6 @@ out_unlock:return r; } -static void kvm_unpin_pages (struct kvm *kvm,pfn_t pfn,unsigned long npages) -{ -unsigned long i; - -for (i =0 ; i < npages; ++i) -kvm_release_pfn_clean (pfn + i); -} -static void kvm_iommu_put_pages (struct kvm *kvm,gfn_t base_gfn,unsigned long npages) {
Hi Li,
At Tue, 23 Sep 2014 10:27:39 +0800,
Quoted 10 lines · Zefan Li
From: Zefan Li <[email protected]>
This is the start of the stable review cycle for the 3.4.104 release. There are 45 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Sep 25 02:03:31 UTC 2014. Anything received after that time might be too late.
This kernel passed my test.
- Test Cases:
- Build this kernel.
- Boot this kernel.
- Build the latest mainline kernel with this kernel.
- Test Tool:
https://github.com/satoru-takeuchi/test-linux-stable
- Test Result (kernel .config, ktest config and test log):
http://satoru-takeuchi.org/test-linux-stable/results/<version>-<test datetime>.tar.xz
- Build Environment:
- OS: Debian Jessy x86_64
- CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4
- memory: 8GB
- Test Target Environment:
- Debian Jessy x86_64 (KVM guest on the Build Environment)
- # of vCPU: 2
- memory: 2GB
Thanks,
Satoru
Quoted 193 lines
A combined patch relative to 3.4.103 will be posted as an additional response to this. A shortlog and diffstat can be found below.
thanks,
Zefan Li
--------------------
Aaro Koskinen (1):
MIPS: OCTEON: makeget_system_type()thread-safeAlan Douglas (1):
xtensa: fix address checks in dma_{alloc,free}_coherentAndi Kleen (1):
slab/mempolicy: always use local policy from interrupt contextAnton Blanchard (1):
ibmveth: Fix endian issues withrx_no_bufferstatisticArjun Sreedharan (1):
pata_scc: propagate return value ofscc_wait_after_resetBenjamin Tissoires (1):
HID: logitech-dj: prevent false errors to be shownBrennan Ashton (1):
USB: option: add VIA Telecom CDS7 chipset device idDaniel Mack (1):
ASoC: pxa-ssp: dropSNDRV_PCM_FMTBIT_S24_LEDave Chiluk (1):
stable_kernel_rules: Add pointer to netdev-FAQ for network patchesFengguang Wu (1):
unicore32: select genericatomic64_tsupportFlorian Fainelli (1):
MIPS: perf: Fix build error caused by unused
counters_per_cpu_to_total()Greg KH (1):
USB: serial: pl2303: add device id for ztek deviceGuan Xuetao (2):
UniCore32-bugfix: Remove definitions inasm/bug.hto solve difference
between native and cross compiler
UniCore32-bugfix: fix mismatch return value of__xchg_bad_pointerHans de Goede (1):
xhci: Treat not finding theevent_segonCOMP_STOPthe same as
COMP_STOP_INVALHuang Rui (1):
usb: xhci: amd chipset also needs short TX quirkJames Forshaw (1):
USB: whiteheat: Added bounds checking for bulk command responseJan Kara (2):
isofs: Fix unbounded recursion when processing relocated directories
ext2: Fix fs corruption inext2_get_xip_mem()Ja�a Bartelj (1):
USB:ftdi_sio: Added PID for new ekey deviceJiri Kosina (4):
HID: fix a couple of off-by-ones
HID: logitech: perform bounds checking ondevice_idearly enough
HID: magicmouse: sanity check report size inraw_event()callback
HID: picolcd: sanity check report size inraw_event()callbackJoerg Roedel (1):
iommu/amd: Fixcleanup_domainfor mass device removalJohan Hovold (3):
USB:ftdi_sio: add Basic Micro ATOM Nano USB2Serial PID
USB: serial: fix potential stack buffer overflow
USB: serial: fix potential heap buffer overflowMark Einon (1):
staging: et131x: Fix errors caused byphydev->addraccesses before
initialisationMark Rutland (2):
ARM: 8128/1: abort: don't clear the exclusive monitors
ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using
dummy strexMax Filippov (3):
xtensa: replace IOCTL code definitions with constants
xtensa: fixTLBTEMP_BASE_2region handling infast_second_level_miss
xtensa: fix a6 and a7 handling infast_syscall_xtensaMichael Cree (2):
alpha: Fix fall-out from disintegratingasm/system.h
alpha: add io{read,write}{16,32}be functionsMichael S. Tsirkin (1):
kvm: iommu: fix the third parameter ofkvm_iommu_put_pages(CVE-2014-3601)NeilBrown (1):
md/raid6: avoid data corruption during recovery of double-degraded
RAID6Paul Gortmaker (1):
8250_pci: fix warnings in backport of Broadcom TruManage supportPavel Shilovsky (1):
CIFS: Fix wrong directory attributes after renameRalf Baechle (1):
MIPS: Fix accessing to per-cpu data when flushing the cacheStefan Kristiansson (1):
openrisc: add missing header inclusionStephen Hemminger (1):
USB: sisusb: add device id for Magic Control USB videoTakashi Iwai (1):
ALSA: hda/realtek - Avoid setting wrong COEF on ALC269 & coTrond Myklebust (1):
NFSv4: Fix problems with close in the presence of a delegationDocumentation/stable_kernel_rules.txt | 3 ++ arch/alpha/include/asm/io.h | 5 +++ arch/alpha/oprofile/common.c | 1 + arch/arm/kernel/entry-header.S | 29 ++++++------ arch/arm/mm/abort-ev6.S | 6 --- arch/arm/mm/abort-ev7.S | 6 --- arch/mips/cavium-octeon/setup.c | 18 +++++--- arch/mips/kernel/perf_event_mipsxx.c | 5 --- arch/mips/mm/c-r4k.c | 5 +++ arch/openrisc/kernel/head.S | 1 + arch/unicore32/Kconfig | 1 + arch/unicore32/include/asm/bug.h | 5 --- arch/unicore32/include/asm/cmpxchg.h | 2 +- arch/unicore32/kernel/setup.h | 6 +++ arch/xtensa/include/asm/ioctls.h | 19 ++++---- arch/xtensa/include/asm/pgtable.h | 7 ++- arch/xtensa/kernel/entry.S | 14 +++--- arch/xtensa/kernel/pci-dma.c | 12 ++--- drivers/ata/pata_scc.c | 15 +++---- drivers/hid/hid-cherry.c | 2 +- drivers/hid/hid-kye.c | 2 +- drivers/hid/hid-lg.c | 4 +- drivers/hid/hid-logitech-dj.c | 54 +++++++++++++---------- drivers/hid/hid-logitech-dj.h | 1 + drivers/hid/hid-magicmouse.c | 10 +++++ drivers/hid/hid-monterey.c | 2 +- drivers/hid/hid-petalynx.c | 2 +- drivers/hid/hid-picolcd.c | 6 +++ drivers/hid/hid-sunplus.c | 2 +- drivers/iommu/amd_iommu.c | 10 +++-- drivers/md/raid5.c | 2 + drivers/net/ethernet/ibm/ibmveth.c | 18 ++++++-- drivers/staging/et131x/et131x.c | 78 ++++++++++++++------------------- drivers/tty/serial/8250/8250_pci.c | 6 +-- drivers/usb/host/xhci-pci.c | 4 ++ drivers/usb/host/xhci-ring.c | 3 +- drivers/usb/misc/sisusbvga/sisusb.c | 1 + drivers/usb/serial/ftdi_sio.c | 3 ++ drivers/usb/serial/ftdi_sio_ids.h | 7 +++ drivers/usb/serial/option.c | 5 +++ drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/usb-serial.c | 35 ++++++++++----- drivers/usb/serial/whiteheat.c | 7 ++- fs/cifs/inode.c | 6 +++ fs/ext2/inode.c | 2 + fs/ext2/xip.c | 1 + fs/isofs/inode.c | 15 ++++--- fs/isofs/isofs.h | 23 ++++++++-- fs/isofs/rock.c | 39 ++++++++++++----- fs/nfs/nfs4proc.c | 17 ++++--- include/linux/mempolicy.h | 2 +- mm/mempolicy.c | 8 +++- mm/slab.c | 4 +- mm/slub.c | 2 +- sound/pci/hda/patch_realtek.c | 17 ++++--- sound/soc/pxa/pxa-ssp.c | 4 +- virt/kvm/iommu.c | 19 ++++---- 58 files changed, 364 insertions(+), 221 deletions(-)Signature · 1 line
1.7.9.5
Quoted 33 lines · Satoru Takeuchi
Hi Li,
At Tue, 23 Sep 2014 10:27:39 +0800,
Quoted 10 lines · Zefan Li
From: Zefan Li <[email protected]>
This is the start of the stable review cycle for the 3.4.104 release. There are 45 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Sep 25 02:03:31 UTC 2014. Anything received after that time might be too late.
This kernel passed my test.
- Test Cases:
- Build this kernel.
- Boot this kernel.
- Build the latest mainline kernel with this kernel.- Test Tool:
https://github.com/satoru-takeuchi/test-linux-stable- Test Result (kernel .config, ktest config and test log):
http://satoru-takeuchi.org/test-linux-stable/results/<version>-<test datetime>.tar.xz- Build Environment:
- OS: Debian Jessyx86_64
- CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4
- memory: 8GB
Quoted 5 lines
- Test Target Environment:
- Debian Jessyx86_64(KVM guest on the Build Environment)
- # of vCPU: 2
- memory: 2GB
Thanks for testing! This is my first time doing stable release, and luckily I haven't broken the build or boot. :)
Quoted 10 lines · Zefan Li
From: Zefan Li <[email protected]>
This is the start of the stable review cycle for the 3.4.104 release. There are 45 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Sep 25 02:03:31 UTC 2014. Anything received after that time might be too late.
Build results:
total: 119 pass: 116 fail: 3
Failed builds:
score:defconfig
sparc64:allmodconfig
xtensa:allmodconfig
Qemu test results:
total: 18 pass: 17 fail: 1
Failed tests:
arm:arm_versatile_defconfig
This is an improvement over the previous release, where we had six build failures. The failing qemu test is a recent addition which is expected to fail for the 3.4 kernel. The failure is due to Versatile SCSI driver and interrupt handling problems; those were fixed in later kernels but would be difficult to back-port.
Guenter
Quoted 19 lines · Guenter Roeck
Quoted 10 lines · Zefan Li
From: Zefan Li <[email protected]>
This is the start of the stable review cycle for the 3.4.104 release. There are 45 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Sep 25 02:03:31 UTC 2014. Anything received after that time might be too late.
Build results:
total: 119 pass: 116 fail: 3Failed builds:
score:defconfig
sparc64:allmodconfig
xtensa:allmodconfig
Quoted 7 lines
Qemu test results:
total: 18 pass: 17 fail: 1Failed tests:
arm:arm_versatile_defconfigThis is an improvement over the previous release, where we had six build failures.
Thanks for digging out the fixes to those build failures.
Quoted 5 lines
The failing qemu test is a recent addition which is expected to fail for the 3.4 kernel. The failure is due to Versatile SCSI driver and interrupt handling problems; those were fixed in later kernels but would be difficult to back-port.
Thanks for testing! This is my first time doing stable release, and luckily I haven't broken the build or boot. :)