Linux 3.10.46
Greg KH
maintainerI'm announcing the release of the 3.10.46 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.10.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/kernel/stacktrace.c | 18 ++- arch/arm/mach-omap1/board-h2.c | 2 arch/arm/mach-omap1/board-h3.c | 2 arch/arm/mach-omap1/board-innovator.c | 2 arch/arm/mach-omap1/board-osk.c | 2 arch/arm/mm/proc-v7-3level.S | 18 ++- arch/arm64/kernel/ptrace.c | 4 arch/s390/include/asm/lowcore.h | 11 +- arch/x86/kernel/entry_32.S | 15 +-- arch/x86/syscalls/syscall_64.tbl | 6 - drivers/acpi/acpica/utstring.c | 2 drivers/acpi/bus.c | 7 + drivers/bluetooth/hci_ldisc.c | 24 ++++- drivers/bluetooth/hci_uart.h | 1 drivers/char/applicom.c | 1 drivers/extcon/extcon-max8997.c | 2 drivers/hid/hid-core.c | 12 ++ drivers/infiniband/ulp/isert/ib_isert.c | 59 ++++++------ drivers/infiniband/ulp/isert/ib_isert.h | 2 drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 6 + drivers/media/usb/stk1160/stk1160-core.c | 10 +- drivers/media/usb/stk1160/stk1160.h | 1 drivers/media/usb/uvc/uvc_video.c | 15 ++- drivers/net/can/sja1000/peak_pci.c | 14 +-- drivers/net/ethernet/ti/cpsw.c | 4 drivers/staging/tidspbridge/core/dsp-clock.c | 4 drivers/target/iscsi/iscsi_target.c | 3 drivers/target/iscsi/iscsi_target_login.c | 7 - drivers/target/target_core_rd.c | 2 drivers/target/target_core_sbc.c | 4 drivers/target/target_core_spc.c | 9 + drivers/target/target_core_transport.c | 29 +++++- drivers/usb/dwc3/gadget.c | 4 drivers/usb/gadget/inode.c | 2 drivers/usb/host/pci-quirks.c | 19 +++- drivers/usb/misc/usbtest.c | 40 +++++++- drivers/usb/phy/phy-isp1301-omap.c | 2 drivers/usb/serial/bus.c | 14 ++- drivers/usb/serial/option.c | 11 ++ drivers/usb/serial/qcserial.c | 21 ++++ drivers/usb/serial/sierra.c | 55 +++++++++-- drivers/usb/serial/usb_wwan.c | 125 ++++++++++++++------------- drivers/video/matrox/matroxfb_base.h | 2 fs/aio.c | 6 - fs/btrfs/backref.c | 32 ++++-- fs/btrfs/backref.h | 4 fs/btrfs/disk-io.c | 5 + fs/btrfs/extent_io.c | 5 - fs/btrfs/free-space-cache.c | 4 fs/btrfs/scrub.c | 5 - fs/btrfs/send.c | 4 fs/btrfs/volumes.c | 32 +++++- fs/ext4/mballoc.c | 2 fs/ext4/page-io.c | 24 ++--- include/linux/irqdesc.h | 4 include/linux/ptrace.h | 32 ++++++ include/target/target_core_backend.h | 1 kernel/fork.c | 10 +- kernel/irq/manage.c | 4 kernel/irq/spurious.c | 106 ++++++++++++++++++++++ lib/idr.c | 8 - mm/memory-failure.c | 25 +++-- mm/rmap.c | 8 + mm/vmscan.c | 46 ++++++++- net/bluetooth/l2cap_sock.c | 5 - net/core/skbuff.c | 2 net/iucv/af_iucv.c | 2 68 files changed, 709 insertions(+), 262 deletions(-)
Alan Stern (2):
USB: usbtest: add a timeout for scatter-gather tests
USB: EHCI: avoid BIOS handover on the HASEE E200
Aleksander Morgado (2):
usb: qcserial: add Netgear AirCard 341U
usb: qcserial: add additional Sierra Wireless QMI devices
Andy Lutomirski (1):
x86_32, entry: Do syscall exit work on badsys (CVE-2014-4508)
Benjamin LaHaise (2):
aio: fix aio request leak when events are reaped by userspace
aio: fix kernel memory disclosure in io_getevents() introduced in v3.10
Chris Mason (1):
Btrfs: fix double free in find_lock_delalloc_range
Christian Borntraeger (1):
s390/lowcore: reserve 96 bytes for IRB in lowcore
Dan Carpenter (1):
applicom: dereferencing NULL on error path
David Binderman (1):
ACPICA: utstring: Check array index bound before use.
Eric Sandeen (1):
btrfs: fix use of uninit "ret" in end_extent_writepage()
Ezequiel Garcia (1):
media: stk1160: Avoid stack-allocated buffer for control URBs
Felipe Balbi (2):
usb: dwc3: gadget: clear stall when disabling endpoint
bluetooth: hci_ldisc: fix deadlock condition
Filipe Manana (1):
Btrfs: send, don't error in the presence of subvols/snapshots
Greg Kroah-Hartman (1):
Linux 3.10.46
H. Peter Anvin (1):
x86-32, espfix: Remove filter for espfix32 due to race
Huang Rui (1):
usb: usbtest: fix unlink write error with pattern 1
Hugh Dickins (1):
mm: fix sleeping function warning from __put_anon_vma
Jan Kara (1):
ext4: fix zeroing of page during writeback
Jianguo Wu (1):
ARM: 8037/1: mm: support big-endian page tables
Johan Hovold (12):
net: cpsw: fix null dereference at probe
USB: option: fix runtime PM handling
USB: usb_wwan: fix write and suspend race
USB: usb_wwan: fix urb leak at shutdown
USB: usb_wwan: fix potential NULL-deref at resume
USB: usb_wwan: fix potential blocked I/O after resume
USB: sierra: fix AA deadlock in open error path
USB: sierra: fix use after free at suspend/resume
USB: sierra: fix urb and memory leak in resume error path
USB: sierra: fix urb and memory leak on disconnect
USB: sierra: fix remote wakeup
USB: serial: fix potential runtime pm imbalance at device remove
Johannes Weiner (1):
mm: vmscan: clear kswapd's special reclaim powers before exiting
Jukka Taimisto (1):
Bluetooth: Fix L2CAP deadlock
Kees Cook (1):
HID: core: fix validation of report id 0
Krzysztof Kozlowski (1):
extcon: max8997: Fix NULL pointer exception on missing pdata
Lai Jiangshan (1):
idr: fix overflow bug during maximum ID calculation at maximum height
Liu Bo (3):
Btrfs: mark mapping with error flag to report errors to userspace
Btrfs: use right type to get real comparison
Btrfs: fix scrub_print_warning to handle skinny metadata extents
Lv Zheng (1):
ACPI: Fix conflict between customized DSDT and DSDT local copy
Matthew Dempsky (1):
ptrace: fix fork event messages across pid namespaces
Maurizio Lombardi (1):
ext4: fix wrong assert in ext4_mb_normalize_request()
Mel Gorman (1):
mm: vmscan: do not throttle based on pfmemalloc reserves if node has no ZONE_NORMAL
Miao Xie (1):
Btrfs: output warning instead of error when loading free space cache failed
Michael S. Tsirkin (1):
skbuff: skb_segment: orphan frags before copying
Mike Frysinger (1):
x86, x32: Use compat shims for io_{setup,submit}Mikulas Patocka (1):
matroxfb: perform a dummy read of M_STATUS
Nicholas A. Bellinger (1):
target: Explicitly clear ramdisk_mcp backend pages
Nicholas Bellinger (3):
target: Set CMD_T_ACTIVE bit for Task Management Requests
target: Use complete_all for se_cmd->t_transport_stop_comp
iscsi-target: Fix ABORT_TASK + connection reset iscsi_queue_req memory leak
Olivier Langlois (1):
media: uvcvideo: Fix clock param realtime setting
Paul Bolle (3):
staging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP
usb: gadget: rename CONFIG_USB_GADGET_PXA25X
ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP
Qu Wenruo (1):
btrfs: Add ctime/mtime update for btrfs device add/remove.
Rickard Strandqvist (1):
fs: btrfs: volumes.c: Fix for possible null pointer dereference
Roger Quadros (1):
usb: usbtest: Add timetout to simple_io()
Roland Dreier (2):
target: Report correct response length for some commands
iscsi-target: Re-add chunk from backport of upstream 79d59d08082d to 3.10
Russell King (1):
ARM: stacktrace: avoid listing stacktrace functions in stacktrace
Sagi Grimberg (4):
Target/iser: Bail from accept_np if np_thread is trying to close Target/iser: Fix hangs in connection teardown Target/iser: Improve cm events handling
Target/iser: Wait for proper cleanup before unloading
Stephane Grosjean (1):
can: peak_pci: prevent use after free at netdev removal
Takashi Iwai (1):
media: ivtv: Fix Oops when no firmware is loaded
Thomas Gleixner (1):
genirq: Sanitize spurious interrupt detection of threaded irqs
Tony Luck (2):
mm/memory-failure.c-failure: send right signal code to correct thread mm/memory-failure.c: don't let collect_procs() skip over processes for MF_ACTION_REQUIRED
Ursula Braun (1):
af_iucv: wrong mapping of sent and confirmed skbs
Wang Shilong (2):
Btrfs: make sure there are not any read requests before stopping workers
Btrfs: set right total device count for seeding support
Will Deacon (1):
arm64: ptrace: change fs when passing kernel pointer to regset code
xiao jin (2):
USB: usb_wwan: fix urb leak in write error path
USB: usb_wwan: fix race between write and resume
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 45 +SUBLEVEL = 46 EXTRAVERSION = NAME = TOSSUG Baby Fish
arch/arm/kernel/stacktrace.c +13 -5
@@ -83,13 +83,16 @@ static int save_trace(struct stackframe *frame, void *d)return trace->nr_entries >= trace->max_entries; } -void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +/* This must be noinline to so that our skip calculation works correctly */ +static noinline void __save_stack_trace(struct task_struct *tsk, +struct stack_trace *trace,unsigned int nosched) {struct stack_trace_data data;struct stackframe frame; data.trace = trace; data.skip = trace->skip; + data.no_sched_functions = nosched;if (tsk != current) {#ifdef CONFIG_SMP
@@ -102,7 +105,6 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) trace->entries[trace->nr_entries++] =ULONG_MAX ;return ;#else - data.no_sched_functions =1 ; frame.fp =thread_saved_fp (tsk); frame.sp =thread_saved_sp (tsk); frame.lr =0 ;/* recovered from the stack */
@@ -111,11 +113,12 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) }else { registerunsigned long current_sp asm ("sp" ); - data.no_sched_functions =0 ; +/* We don't want this function nor the caller */ + data.skip +=2 ; frame.fp = (unsigned long )__builtin_frame_address (0 ); frame.sp = current_sp; frame.lr = (unsigned long )__builtin_return_address (0 ); - frame.pc = (unsigned long )save_stack_trace_tsk; + frame.pc = (unsigned long )__save_stack_trace; }walk_stackframe (&frame, save_trace, &data);
@@ -123,9 +126,14 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) trace->entries[trace->nr_entries++] = ULONG_MAX; } +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +__save_stack_trace (tsk, trace,1 ); +} +void save_stack_trace (struct stack_trace *trace) { -save_stack_trace_tsk (current, trace); +__save_stack_trace (current, trace,0 ); }EXPORT_SYMBOL_GPL (save_stack_trace);#endif
arch/arm/mach-omap1/board-h2.c +1 -1
@@ -379,7 +379,7 @@ static struct omap_usb_config h2_usb_config __initdata = {/* usb1 has a Mini-AB port and external isp1301 transceiver */ .otg = 2, -#ifdef CONFIG_USB_GADGET_OMAP +#if IS_ENABLED (CONFIG_USB_OMAP ) .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled *//* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */ #elif defined(CONFIG_USB_OHCI_HCD ) || defined(CONFIG_USB_OHCI_HCD_MODULE )
arch/arm/mach-omap1/board-h3.c +1 -1
@@ -366,7 +366,7 @@ static struct omap_usb_config h3_usb_config __initdata = {/* usb1 has a Mini-AB port and external isp1301 transceiver */ .otg = 2, -#ifdef CONFIG_USB_GADGET_OMAP +#if IS_ENABLED (CONFIG_USB_OMAP ) .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */#elif defined(CONFIG_USB_OHCI_HCD ) || defined(CONFIG_USB_OHCI_HCD_MODULE )/* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
arch/arm/mach-omap1/board-innovator.c +1 -1
@@ -312,7 +312,7 @@ static struct omap_usb_config h2_usb_config __initdata = {/* usb1 has a Mini-AB port and external isp1301 transceiver */ .otg = 2, -#ifdef CONFIG_USB_GADGET_OMAP +#if IS_ENABLED (CONFIG_USB_OMAP ) .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled *//* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */ #elif defined(CONFIG_USB_OHCI_HCD ) || defined(CONFIG_USB_OHCI_HCD_MODULE )
arch/arm/mach-omap1/board-osk.c +1 -1
@@ -280,7 +280,7 @@ static struct omap_usb_config osk_usb_config __initdata = {* be used, with a NONSTANDARD gender-bending cable/dongle, as * a peripheral. */ -#ifdef CONFIG_USB_GADGET_OMAP +#if IS_ENABLED (CONFIG_USB_OMAP ) .register_dev = 1, .hmc_mode = 0,#else
arch/arm/mm/proc-v7-3level.S +13 -5
@@ -56,6 +56,14 @@ ENTRY(cpu_v7_switch_mm) mov pc, lr ENDPROC(cpu_v7_switch_mm) +#ifdef __ARMEB__ +#define rl r3 +#define rh r2 +#else +#define rl r2 +#define rh r3 +#endif + /* * cpu_v7_set_pte_ext(ptep, pte) *
@@ -65,13 +73,13 @@ ENDPROC(cpu_v7_switch_mm) */ ENTRY(cpu_v7_set_pte_ext) #ifdef CONFIG_MMU - tst r2, #L_PTE_VALID + tst rl, #L_PTE_VALID beq 1f - tst r3, #1 << (57 - 32) @ L_PTE_NONE - bicne r2, #L_PTE_VALID + tst rh, #1 << (57 - 32) @ L_PTE_NONE + bicne rl, #L_PTE_VALID bne 1f - tst r3, #1 << (55 - 32) @ L_PTE_DIRTY - orreq r2, #L_PTE_RDONLY + tst rh, #1 << (55 - 32) @ L_PTE_DIRTY + orreq rl, #L_PTE_RDONLY 1: strd r2, r3, [r0] ALT_SMP(W(nop)) ALT_UP (mcr p15, 0, r0, c7, c10, 1) @ flush_pte
arch/arm64/kernel/ptrace.c +4 -0
@@ -872,6 +872,7 @@ static int compat_ptrace_write_user(struct task_struct *tsk, compat_ulong_t off, compat_ulong_t val) {int ret; +mm_segment_t old_fs =get_fs ();if (off &3 || off >=COMPAT_USER_SZ )return -EIO ;
@@ -879,10 +880,13 @@ static int compat_ptrace_write_user(struct task_struct *tsk, compat_ulong_t off,if (off >=sizeof (compat_elf_gregset_t))return 0 ; +set_fs (KERNEL_DS ); ret =copy_regset_from_user (tsk, &user_aarch32_view,REGSET_COMPAT_GPR , off,sizeof (compat_ulong_t), &val); +set_fs (old_fs); +return ret; }
arch/s390/include/asm/lowcore.h +6 -5
@@ -142,9 +142,9 @@ struct _lowcore {__u8 pad_0x02fc[0x0300 -0x02fc ];/* 0x02fc */ /* Interrupt response block */ -__u8 irb[64 ];/* 0x0300 */ +__u8 irb[96 ];/* 0x0300 */ -__u8 pad_0x0340[0x0e00 -0x0340 ];/* 0x0340 */ +__u8 pad_0x0360[0x0e00 -0x0360 ];/* 0x0360 */ /* * 0xe00 contains the address of the IPL Parameter Information
@@ -288,12 +288,13 @@ struct _lowcore {__u8 pad_0x03a0[0x0400 -0x03a0 ];/* 0x03a0 */ /* Interrupt response block. */ -__u8 irb[64 ];/* 0x0400 */ +__u8 irb[96 ];/* 0x0400 */ +__u8 pad_0x0460[0x0480 -0x0460 ];/* 0x0460 */ /* Per cpu primary space access list */ -__u32 paste[16 ];/* 0x0440 */ +__u32 paste[16 ];/* 0x0480 */ -__u8 pad_0x0480[0x0e00 -0x0480 ];/* 0x0480 */ +__u8 pad_0x04c0[0x0e00 -0x04c0 ];/* 0x04c0 */ /* * 0xe00 contains the address of the IPL Parameter Information
arch/x86/kernel/entry_32.S +8 -7
@@ -434,9 +434,10 @@ sysenter_past_esp: jnz sysenter_audit sysenter_do_call: cmpl $(NR_syscalls), %eax - jae syscall_badsys + jae sysenter_badsys call *sys_call_table(,%eax,4) movl %eax,PT_EAX(%esp) +sysenter_after_call: LOCKDEP_SYS_EXIT DISABLE_INTERRUPTS(CLBR_ANY) TRACE_IRQS_OFF
@@ -554,11 +555,6 @@ ENTRY(iret_exc) CFI_RESTORE_STATE ldt_ss: - larl PT_OLDSS(%esp), %eax - jnz restore_nocheck - testl $0x00400000, %eax # returning to 32bit stack? - jnz restore_nocheck # allright, normal return - #ifdef CONFIG_PARAVIRT /* * The kernel can't run on a non-flat stack if paravirt mode
@@ -691,7 +687,12 @@ END(syscall_fault) syscall_badsys: movl $-ENOSYS,PT_EAX(%esp) - jmp resume_userspace + jmp syscall_exit +END(syscall_badsys) + +sysenter_badsys: + movl $-ENOSYS,PT_EAX(%esp) + jmp sysenter_after_call END(syscall_badsys) CFI_ENDPROC /*
arch/x86/syscalls/syscall_64.tbl +4 -2
@@ -212,10 +212,10 @@ 203 common sched_setaffinity sys_sched_setaffinity 204 common sched_getaffinity sys_sched_getaffinity 205 64 set_thread_area -206 common io_setup sys_io_setup +206 64 io_setup sys_io_setup 207 common io_destroy sys_io_destroy 208 common io_getevents sys_io_getevents -209 common io_submit sys_io_submit +209 64 io_submit sys_io_submit 210 common io_cancel sys_io_cancel 211 64 get_thread_area 212 common lookup_dcookie sys_lookup_dcookie
@@ -356,3 +356,5 @@ 540 x32 process_vm_writev compat_sys_process_vm_writev 541 x32 setsockopt compat_sys_setsockopt 542 x32 getsockopt compat_sys_getsockopt +543 x32 io_setup compat_sys_io_setup +544 x32 io_submit compat_sys_io_submit
drivers/acpi/acpica/utstring.c +1 -1
@@ -349,7 +349,7 @@ void acpi_ut_print_string(char *string, u8 max_length) }acpi_os_printf ("\"" ); -for (i =0 ; string[i] && (i < max_length); i++) { +for (i =0 ; (i < max_length) && string[i]; i++) {/* Escape sequences */
drivers/acpi/bus.c +7 -0
@@ -57,6 +57,12 @@ EXPORT_SYMBOL(acpi_root_dir); #ifdef CONFIG_X86 +#ifdef CONFIG_ACPI_CUSTOM_DSDT +static inline int set_copy_dsdt(const struct dmi_system_id *id) +{ + return 0; +} +#else static int set_copy_dsdt(const struct dmi_system_id *id) { printk(KERN_NOTICE "%s detected - "
@@ -64,6 +70,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id) acpi_gbl_copy_dsdt_locally =1 ;return 0 ; } +#endif static struct dmi_system_id dsdt_dmi_table[]__initdata = {/*
drivers/bluetooth/hci_ldisc.c +19 -5
@@ -118,10 +118,6 @@ static inline struct sk_buff *hci_uart_dequeue(struct hci_uart *hu)int hci_uart_tx_wakeup (struct hci_uart *hu) { -struct tty_struct *tty = hu->tty; -struct hci_dev *hdev = hu->hdev; -struct sk_buff *skb; -if (test_and_set_bit (HCI_UART_SENDING , &hu->tx_state)) {set_bit (HCI_UART_TX_WAKEUP , &hu->tx_state);return 0 ;
@@ -129,6 +125,22 @@ int hci_uart_tx_wakeup(struct hci_uart *hu)BT_DBG ("" ); +schedule_work (&hu->write_work); + +return 0 ; +} + +static void hci_uart_write_work (struct work_struct *work) +{ + struct hci_uart *hu = container_of(work, struct hci_uart, write_work); +struct tty_struct *tty = hu->tty; +struct hci_dev *hdev = hu->hdev; +struct sk_buff *skb; + +/* REVISIT: should we cope with bad skbs or ->write() returning +* and error value ? +*/ + restart:clear_bit (HCI_UART_TX_WAKEUP , &hu->tx_state);
@@ -153,7 +165,6 @@ restart: goto restart;clear_bit (HCI_UART_SENDING , &hu->tx_state); -return 0 ; }static void hci_uart_init_work (struct work_struct *work)
@@ -289,6 +300,7 @@ static int hci_uart_tty_open(struct tty_struct *tty) tty->receive_room =65536 ;INIT_WORK (&hu->init_ready, hci_uart_init_work); +INIT_WORK (&hu->write_work, hci_uart_write_work);spin_lock_init (&hu->rx_lock);
@@ -326,6 +338,8 @@ static void hci_uart_tty_close(struct tty_struct *tty)if (hdev)hci_uart_close (hdev); +cancel_work_sync (&hu->write_work); +if (test_and_clear_bit (HCI_UART_PROTO_SET , &hu->flags)) {if (hdev) {if (test_bit (HCI_UART_REGISTERED , &hu->flags))
drivers/bluetooth/hci_uart.h +1 -0
@@ -68,6 +68,7 @@ struct hci_uart {unsigned long hdev_flags;struct work_struct init_ready; +struct work_struct write_work;struct hci_uart_proto *proto;void *priv;
drivers/char/applicom.c +0 -1
@@ -345,7 +345,6 @@ out:free_irq (apbs[i].irq, &dummy);iounmap (apbs[i].RamIO); } -pci_disable_device (dev);return ret; }
drivers/extcon/extcon-max8997.c +1 -1
@@ -712,7 +712,7 @@ static int max8997_muic_probe(struct platform_device *pdev) goto err_irq; } -if (pdata->muic_pdata) { +if (pdata && pdata->muic_pdata) {struct max8997_muic_platform_data *muic_pdata = pdata->muic_pdata;
drivers/hid/hid-core.c +11 -1
@@ -796,7 +796,17 @@ struct hid_report *hid_validate_values(struct hid_device *hid,* ->numbered being checked, which may not always be the case when * drivers go to access report values. */ - report = hid->report_enum[type].report_id_hash[id]; +if (id ==0 ) { +/* +* Validating on id 0 means we should examine the first +* report in the list. +*/ + report =list_entry ( + hid->report_enum[type].report_list.next, + struct hid_report, list); + }else { + report = hid->report_enum[type].report_id_hash[id]; + }if (!report) {hid_err (hid,"missing %s %u\n" , hid_report_names[type], id);return NULL ;
drivers/infiniband/ulp/isert/ib_isert.c +28 -31
128 lines not on this page · raw message
drivers/infiniband/ulp/isert/ib_isert.h +1 -1
@@ -78,7 +78,6 @@ struct isert_device;struct isert_conn {enum iser_conn_state state; -bool logout_posted;int post_recv_buf_count;atomic_t post_send_buf_count;u32 responder_resources;
@@ -106,6 +105,7 @@ struct isert_conn {struct completion conn_wait;struct completion conn_wait_comp_err;struct kref conn_kref; +bool disconnect; };#define ISERT_MAX_CQ 64
drivers/media/pci/ivtv/ivtv-alsa-pcm.c +6 -0
@@ -159,6 +159,12 @@ static int snd_ivtv_pcm_capture_open(struct snd_pcm_substream *substream)/* Instruct the CX2341[56] to start sending packets */ snd_ivtv_lock (itvsc); + +if (ivtv_init_on_first_open (itv)) { +snd_ivtv_unlock (itvsc); +return -ENXIO ; + } + s = &itv->streams[IVTV_ENC_STREAM_TYPE_PCM ];v4l2_fh_init (&item.fh, s->vdev);
drivers/media/usb/stk1160/stk1160-core.c +9 -1
@@ -67,17 +67,25 @@ int stk1160_read_reg(struct stk1160 *dev, u16 reg, u8 *value) {int ret;int pipe =usb_rcvctrlpipe (dev->udev,0 ); +u8 *buf; *value =0 ; + + buf =kmalloc (sizeof (u8),GFP_KERNEL ); +if (!buf) +return -ENOMEM ; ret =usb_control_msg (dev->udev, pipe,0x00 ,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , -0x00 , reg, value,sizeof (u8),HZ ); +0x00 , reg, buf,sizeof (u8),HZ );if (ret <0 ) {stk1160_err ("read failed on reg 0x%x (%d)\n" , reg, ret); +kfree (buf);return ret; } + *value = *buf; +kfree (buf);return 0 ; }
drivers/media/usb/stk1160/stk1160.h +0 -1
@@ -143,7 +143,6 @@ struct stk1160 {int num_alt;struct stk1160_isoc_ctl isoc_ctl; -char urb_buf[255 ];/* urb control msg buffer */ /* frame properties */ int width;/* current frame width */
drivers/media/usb/uvc/uvc_video.c +10 -5
@@ -361,6 +361,14 @@ static int uvc_commit_video(struct uvc_streaming *stream,* Clocks and timestamps */ +static inline void uvc_video_get_ts (struct timespec *ts) +{ +if (uvc_clock_param ==CLOCK_MONOTONIC ) +ktime_get_ts (ts); +else +ktime_get_real_ts (ts); +} +static void uvc_video_clock_decode (struct uvc_streaming *stream,struct uvc_buffer *buf,const __u8 *data,int len)
@@ -420,7 +428,7 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, stream->clock.last_sof = dev_sof; host_sof =usb_get_current_frame_number (stream->dev->udev); -ktime_get_ts (&ts); +uvc_video_get_ts (&ts);/* The UVC specification allows device implementations that can't obtain * the USB frame number to keep their own frame counters as long as they
@@ -1010,10 +1018,7 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,return -ENODATA ; } -if (uvc_clock_param ==CLOCK_MONOTONIC ) -ktime_get_ts (&ts); -else -ktime_get_real_ts (&ts); +uvc_video_get_ts (&ts); buf->buf.v4l2_buf.sequence = stream->sequence; buf->buf.v4l2_buf.timestamp.tv_sec = ts.tv_sec;
drivers/net/can/sja1000/peak_pci.c +9 -5
@@ -551,7 +551,7 @@ static int peak_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) {struct sja1000_priv *priv;struct peak_pci_chan *chan; -struct net_device *dev; +struct net_device *dev, *prev_dev;void __iomem *cfg_base, *reg_base;u16 sub_sys_id, icr;int i, err, channels;
@@ -687,11 +687,13 @@ failure_remove_channels:writew (0x0 , cfg_base +PITA_ICR +2 ); chan =NULL ; -for (dev =pci_get_drvdata (pdev); dev; dev = chan->prev_dev) { -unregister_sja1000dev (dev); -free_sja1000dev (dev); +for (dev =pci_get_drvdata (pdev); dev; dev = prev_dev) { priv =netdev_priv (dev); chan = priv->priv; + prev_dev = chan->prev_dev; + +unregister_sja1000dev (dev); +free_sja1000dev (dev); }/* free any PCIeC resources too */
@@ -725,10 +727,12 @@ static void peak_pci_remove(struct pci_dev *pdev)/* Loop over all registered devices */ while (1 ) { +struct net_device *prev_dev = chan->prev_dev; +dev_info (&pdev->dev,"removing device %s\n" , dev->name);unregister_sja1000dev (dev);free_sja1000dev (dev); - dev = chan->prev_dev; + dev = prev_dev;if (!dev) {/* do that only for first channel */
drivers/net/ethernet/ti/cpsw.c +4 -0
@@ -1547,6 +1547,10 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, mdio_node =of_find_node_by_phandle (be32_to_cpup (parp)); phyid =be32_to_cpup (parp+1 ); mdio =of_find_device_by_node (mdio_node); +if (!mdio) { +pr_err ("Missing mdio platform device\n" ); +return -EINVAL ; + }snprintf (slave_data->phy_id,sizeof (slave_data->phy_id),PHY_ID_FMT , mdio->name, phyid);
drivers/staging/tidspbridge/core/dsp-clock.c +2 -2
@@ -226,7 +226,7 @@ int dsp_clk_enable(enum dsp_clk_id clk_id)case GPT_CLK : status =omap_dm_timer_start (timer[clk_id -1 ]);break ; -#ifdef CONFIG_OMAP_MCBSP +#ifdef CONFIG_SND_OMAP_SOC_MCBSP case MCBSP_CLK :omap_mcbsp_request (MCBSP_ID (clk_id));omap2_mcbsp_set_clks_src (MCBSP_ID (clk_id),MCBSP_CLKS_PAD_SRC );
@@ -302,7 +302,7 @@ int dsp_clk_disable(enum dsp_clk_id clk_id)case GPT_CLK : status =omap_dm_timer_stop (timer[clk_id -1 ]);break ; -#ifdef CONFIG_OMAP_MCBSP +#ifdef CONFIG_SND_OMAP_SOC_MCBSP case MCBSP_CLK :omap2_mcbsp_set_clks_src (MCBSP_ID (clk_id),MCBSP_CLKS_PRCM_SRC );omap_mcbsp_free (MCBSP_ID (clk_id));
drivers/target/iscsi/iscsi_target.c +1 -2
@@ -4151,8 +4151,6 @@ int iscsit_close_connection(if (conn->conn_transport->iscsit_wait_conn) conn->conn_transport->iscsit_wait_conn (conn); -iscsit_free_queue_reqs_for_conn (conn); -/* * During Connection recovery drop unacknowledged out of order * commands for this connection, and prepare the other commands
@@ -4169,6 +4167,7 @@ int iscsit_close_connection(iscsit_clear_ooo_cmdsns_for_conn (conn);iscsit_release_commands_from_conn (conn); } +iscsit_free_queue_reqs_for_conn (conn);/* * Handle decrementing session or connection usage count if
drivers/target/iscsi/iscsi_target_login.c +1 -6
@@ -597,13 +597,8 @@ static int iscsi_login_non_zero_tsih_s2(* * In our case, we have already located the struct iscsi_tiqn at this point. */ -memset (buf,0 ,32 ); -sprintf (buf,"TargetPortalGroupTag=%hu" ,ISCSI_TPG_S (sess)->tpgt); -if (iscsi_change_param_value (buf, conn->param_list,0 ) <0 ) { -iscsit_tx_login_rsp (conn,ISCSI_STATUS_CLS_TARGET_ERR , -ISCSI_LOGIN_STATUS_NO_RESOURCES ); +if (iscsi_change_param_sprintf (conn,"TargetPortalGroupTag=%hu" , sess->tpg->tpgt))return -1 ; - }return iscsi_login_disable_FIM_keys (conn->param_list, conn); }
drivers/target/target_core_rd.c +1 -1
@@ -174,7 +174,7 @@ static int rd_build_device_space(struct rd_dev *rd_dev) -1 ;for (j =0 ; j < sg_per_table; j++) { - pg =alloc_pages (GFP_KERNEL ,0 ); + pg =alloc_pages (GFP_KERNEL | __GFP_ZERO,0 );if (!pg) {pr_err ("Unable to allocate scatterlist" " pages for struct rd_dev_sg_table\n" );
drivers/target/target_core_sbc.c +2 -2
@@ -63,7 +63,7 @@ sbc_emulate_readcapacity(struct se_cmd *cmd)transport_kunmap_data_sg (cmd); } -target_complete_cmd (cmd,GOOD ); +target_complete_cmd_with_length (cmd,GOOD ,8 );return 0 ; }
@@ -101,7 +101,7 @@ sbc_emulate_readcapacity_16(struct se_cmd *cmd)transport_kunmap_data_sg (cmd); } -target_complete_cmd (cmd,GOOD ); +target_complete_cmd_with_length (cmd,GOOD ,32 );return 0 ; }
drivers/target/target_core_spc.c +6 -3
@@ -628,6 +628,7 @@ spc_emulate_inquiry(struct se_cmd *cmd)unsigned char buf[SE_INQUIRY_BUF ];sense_reason_t ret;int p; +int len =0 ;memset (buf,0 ,SE_INQUIRY_BUF );
@@ -645,6 +646,7 @@ spc_emulate_inquiry(struct se_cmd *cmd) } ret =spc_emulate_inquiry_std (cmd, buf); + len = buf[4 ] +5 ; goto out; }
@@ -652,6 +654,7 @@ spc_emulate_inquiry(struct se_cmd *cmd)if (cdb[2 ] == evpd_handlers[p].page) { buf[1 ] = cdb[2 ]; ret = evpd_handlers[p].emulate (cmd, buf); + len =get_unaligned_be16 (&buf[2 ]) +4 ; goto out; } }
@@ -667,7 +670,7 @@ out: }if (!ret) -target_complete_cmd (cmd,GOOD ); +target_complete_cmd_with_length (cmd,GOOD , len);return ret; }
@@ -985,7 +988,7 @@ set_length:transport_kunmap_data_sg (cmd); } -target_complete_cmd (cmd,GOOD ); +target_complete_cmd_with_length (cmd,GOOD , length);return 0 ; }
@@ -1162,7 +1165,7 @@ done: buf[3 ] = (lun_count &0xff );transport_kunmap_data_sg (cmd); -target_complete_cmd (cmd,GOOD ); +target_complete_cmd_with_length (cmd,GOOD ,8 + lun_count *8 );return 0 ; }EXPORT_SYMBOL (spc_emulate_report_luns);
drivers/target/target_core_transport.c +26 -3
@@ -488,7 +488,7 @@ static int transport_cmd_check_stop(struct se_cmd *cmd, bool remove_from_lists)spin_unlock_irqrestore (&cmd->t_state_lock, flags); -complete (&cmd->t_transport_stop_comp); +complete_all (&cmd->t_transport_stop_comp);return 1 ; }
@@ -617,7 +617,7 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status)if (cmd->transport_state &CMD_T_ABORTED && cmd->transport_state &CMD_T_STOP ) {spin_unlock_irqrestore (&cmd->t_state_lock, flags); -complete (&cmd->t_transport_stop_comp); +complete_all (&cmd->t_transport_stop_comp);return ; }else if (cmd->transport_state &CMD_T_FAILED ) {INIT_WORK (&cmd->work, target_complete_failure_work);
@@ -633,6 +633,23 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status) }EXPORT_SYMBOL (target_complete_cmd); +void target_complete_cmd_with_length (struct se_cmd *cmd,u8 scsi_status,int length) +{ +if (scsi_status ==SAM_STAT_GOOD && length < cmd->data_length) { +if (cmd->se_cmd_flags &SCF_UNDERFLOW_BIT ) { + cmd->residual_count += cmd->data_length - length; + }else { + cmd->se_cmd_flags |=SCF_UNDERFLOW_BIT ; + cmd->residual_count = cmd->data_length - length; + } + + cmd->data_length = length; + } + +target_complete_cmd (cmd, scsi_status); +} +EXPORT_SYMBOL (target_complete_cmd_with_length); +static void target_add_to_state_list (struct se_cmd *cmd) {struct se_device *dev = cmd->se_dev;
@@ -1688,7 +1705,7 @@ void target_execute_cmd(struct se_cmd *cmd) cmd->se_tfo->get_task_tag(cmd));spin_unlock_irq (&cmd->t_state_lock); -complete (&cmd->t_transport_stop_comp); +complete_all (&cmd->t_transport_stop_comp);return ; }
@@ -2877,6 +2894,12 @@ static void target_tmr_work(struct work_struct *work)int transport_generic_handle_tmr (struct se_cmd *cmd) { +unsigned long flags; + +spin_lock_irqsave (&cmd->t_state_lock, flags); + cmd->transport_state |=CMD_T_ACTIVE ; +spin_unlock_irqrestore (&cmd->t_state_lock, flags); +INIT_WORK (&cmd->work, target_tmr_work);queue_work (cmd->se_dev->tmr_wq, &cmd->work);return 0 ;
drivers/usb/dwc3/gadget.c +4 -0
@@ -604,6 +604,10 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)dwc3_remove_requests (dwc, dep); +/* make sure HW endpoint isn't stalled */ +if (dep->flags &DWC3_EP_STALL ) +__dwc3_gadget_ep_set_halt (dep,0 ); + reg =dwc3_readl (dwc->regs,DWC3_DALEPENA ); reg &= ~DWC3_DALEPENA_EP (dep->number);dwc3_writel (dwc->regs,DWC3_DALEPENA , reg);
drivers/usb/gadget/inode.c +1 -1
@@ -1509,7 +1509,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) }break ; -#ifndef CONFIG_USB_GADGET_PXA25X +#ifndef CONFIG_USB_PXA25X /* PXA automagically handles this request too */ case USB_REQ_GET_CONFIGURATION :if (ctrl->bRequestType !=0x80 )
drivers/usb/host/pci-quirks.c +16 -3
@@ -555,6 +555,14 @@ static const struct dmi_system_id ehci_dmi_nohandoff_table[] = { DMI_MATCH(DMI_BIOS_VERSION, "Lucid-"), }, }, + { + /* HASEE E200 */ + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "HASEE"), + DMI_MATCH(DMI_BOARD_NAME, "E210"), + DMI_MATCH(DMI_BIOS_VERSION, "6.00"), + }, + }, { } };
@@ -564,9 +572,14 @@ static void ehci_bios_handoff(struct pci_dev *pdev, {int try_handoff =1 , tried_handoff =0 ; -/* The Pegatron Lucid tablet sporadically waits for 98 seconds trying -* the handoff on its unused controller. Skip it. */ -if (pdev->vendor ==0x8086 && pdev->device ==0x283a ) { +/* +* The Pegatron Lucid tablet sporadically waits for 98 seconds trying +* the handoff on its unused controller. Skip it. +* +* The HASEE E200 hangs when the semaphore is set (bugzilla #77021). +*/ +if (pdev->vendor ==0x8086 && (pdev->device ==0x283a || + pdev->device ==0x27cc )) {if (dmi_check_system (ehci_dmi_nohandoff_table)) try_handoff =0 ; }
drivers/usb/misc/usbtest.c +36 -4
@@ -7,9 +7,10 @@#include <linux/moduleparam.h> #include <linux/scatterlist.h> #include <linux/mutex.h> - +#include <linux/timer.h> #include <linux/usb.h> +#define SIMPLE_IO_TIMEOUT 10000/* in milliseconds */ /*-------------------------------------------------------------------------*/
@@ -366,6 +367,7 @@ static int simple_io(int max = urb->transfer_buffer_length;struct completion completion;int retval =0 ; +unsigned long expire; urb->context = &completion;while (retval ==0 && iterations-- >0 ) {
@@ -378,9 +380,15 @@ static int simple_io(if (retval !=0 )break ; -/* NOTE: no timeouts; can't be broken out of by interrupt */ -wait_for_completion (&completion); - retval = urb->status; + expire =msecs_to_jiffies (SIMPLE_IO_TIMEOUT ); +if (!wait_for_completion_timeout (&completion, expire)) { +usb_kill_urb (urb); + retval = (urb->status == -ENOENT ? + -ETIMEDOUT : urb->status); + }else { + retval = urb->status; + } + urb->dev = udev;if (retval ==0 &&usb_pipein (urb->pipe)) retval =simple_check_buf (tdev, urb);
@@ -476,6 +484,14 @@ alloc_sglist(int nents, int max, int vary)return sg; } +static void sg_timeout (unsigned long _req) +{ +struct usb_sg_request *req = (struct usb_sg_request *) _req; + + req->status = -ETIMEDOUT ; +usb_sg_cancel (req); +} + static int perform_sglist( struct usbtest_dev *tdev, unsigned iterations,
@@ -487,6 +503,9 @@ static int perform_sglist( {struct usb_device *udev =testdev_to_usbdev (tdev);int retval =0 ; +struct timer_list sg_timer; + +setup_timer_on_stack (&sg_timer, sg_timeout, (unsigned long ) req);while (retval ==0 && iterations-- >0 ) { retval = usb_sg_init(req, udev, pipe,
@@ -497,7 +516,10 @@ static int perform_sglist(if (retval)break ; +mod_timer (&sg_timer, jiffies + +msecs_to_jiffies (SIMPLE_IO_TIMEOUT ));usb_sg_wait (req); +del_timer_sync (&sg_timer); retval = req->status;/* FIXME check resulting data pattern */
@@ -1149,6 +1171,11 @@ static int unlink1(struct usbtest_dev *dev, int pipe, int size, int async) urb->context = &completion; urb->complete = unlink1_callback; +if (usb_pipeout (urb->pipe)) { +simple_fill_buf (urb); + urb->transfer_flags |=URB_ZERO_PACKET ; + } +/* keep the endpoint busy. there are lots of hc/hcd-internal * states, and testing should get to all of them over time. *
@@ -1279,6 +1306,11 @@ static int unlink_queued(struct usbtest_dev *dev, int pipe, unsigned num, unlink_queued_callback, &ctx); ctx.urbs[i]->transfer_dma = buf_dma; ctx.urbs[i]->transfer_flags =URB_NO_TRANSFER_DMA_MAP ; + +if (usb_pipeout (ctx.urbs[i]->pipe)) { +simple_fill_buf (ctx.urbs[i]); + ctx.urbs[i]->transfer_flags |=URB_ZERO_PACKET ; + } }/* Submit all the URBs and then unlink URBs num - 4 and num - 2. */
drivers/usb/phy/phy-isp1301-omap.c +1 -1
@@ -1299,7 +1299,7 @@ isp1301_set_host(struct usb_otg *otg, struct usb_bus *host)return isp1301_otg_enable (isp);return 0 ; -#elif !defined(CONFIG_USB_GADGET_OMAP ) +#elif !IS_ENABLED (CONFIG_USB_OMAP )// FIXME update its refcount otg->host = host;
drivers/usb/serial/bus.c +11 -3
@@ -98,13 +98,19 @@ static int usb_serial_device_remove(struct device *dev)struct usb_serial_port *port;int retval =0 ;int minor; +int autopm_err; port =to_usb_serial_port (dev);if (!port)return -ENODEV ; -/* make sure suspend/resume doesn't race against port_remove */ -usb_autopm_get_interface (port->serial->interface); +/* +* Make sure suspend/resume doesn't race against port_remove. +* +* Note that no further runtime PM callbacks will be made if +* autopm_get fails. +*/ + autopm_err =usb_autopm_get_interface (port->serial->interface); minor = port->number;tty_unregister_device (usb_serial_tty_driver, minor);
@@ -118,7 +124,9 @@ static int usb_serial_device_remove(struct device *dev)dev_info (dev,"%s converter now disconnected from ttyUSB%d\n" , driver->description, minor); -usb_autopm_put_interface (port->serial->interface); +if (!autopm_err) +usb_autopm_put_interface (port->serial->interface); +return retval; }
drivers/usb/serial/option.c +10 -1
@@ -1925,6 +1925,7 @@ static int option_send_setup(struct usb_serial_port *port)struct option_private *priv = intfdata->private;struct usb_wwan_port_private *portdata;int val =0 ; +int res; portdata =usb_get_serial_port_data (port);
@@ -1933,9 +1934,17 @@ static int option_send_setup(struct usb_serial_port *port)if (portdata->rts_state) val |=0x02 ; -return usb_control_msg (serial->dev,usb_rcvctrlpipe (serial->dev,0 ), + res =usb_autopm_get_interface (serial->interface); +if (res) +return res; + + res =usb_control_msg (serial->dev,usb_rcvctrlpipe (serial->dev,0 ),0x22 ,0x21 , val, priv->bInterfaceNumber,NULL ,0 ,USB_CTRL_SET_TIMEOUT ); + +usb_autopm_put_interface (serial->interface); + +return res; }MODULE_AUTHOR (DRIVER_AUTHOR );
drivers/usb/serial/qcserial.c +21 -0
@@ -145,12 +145,33 @@ static const struct usb_device_id id_table[] = { {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901f, 0)}, /* Sierra Wireless EM7355 Device Management */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901f, 2)}, /* Sierra Wireless EM7355 NMEA */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901f, 3)}, /* Sierra Wireless EM7355 Modem */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9040, 0)}, /* Sierra Wireless Modem Device Management */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9040, 2)}, /* Sierra Wireless Modem NMEA */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9040, 3)}, /* Sierra Wireless Modem Modem */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9041, 0)}, /* Sierra Wireless MC7305/MC7355 Device Management */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9041, 2)}, /* Sierra Wireless MC7305/MC7355 NMEA */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9041, 3)}, /* Sierra Wireless MC7305/MC7355 Modem */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 0)}, /* Netgear AirCard 340U Device Management */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 2)}, /* Netgear AirCard 340U NMEA */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9051, 3)}, /* Netgear AirCard 340U Modem */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9053, 0)}, /* Sierra Wireless Modem Device Management */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9053, 2)}, /* Sierra Wireless Modem NMEA */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9053, 3)}, /* Sierra Wireless Modem Modem */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9054, 0)}, /* Sierra Wireless Modem Device Management */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9054, 2)}, /* Sierra Wireless Modem NMEA */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9054, 3)}, /* Sierra Wireless Modem Modem */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9055, 0)}, /* Netgear AirCard 341U Device Management */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9055, 2)}, /* Netgear AirCard 341U NMEA */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9055, 3)}, /* Netgear AirCard 341U Modem */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9056, 0)}, /* Sierra Wireless Modem Device Management */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9056, 2)}, /* Sierra Wireless Modem NMEA */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9056, 3)}, /* Sierra Wireless Modem Modem */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9060, 0)}, /* Sierra Wireless Modem Device Management */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9060, 2)}, /* Sierra Wireless Modem NMEA */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9060, 3)}, /* Sierra Wireless Modem Modem */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9061, 0)}, /* Sierra Wireless Modem Device Management */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9061, 2)}, /* Sierra Wireless Modem NMEA */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x9061, 3)}, /* Sierra Wireless Modem Modem */ {USB_DEVICE_INTERFACE_NUMBER(0x413c, 0x81a2, 0)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card Device Management */ {USB_DEVICE_INTERFACE_NUMBER(0x413c, 0x81a2, 2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card NMEA */ {USB_DEVICE_INTERFACE_NUMBER(0x413c, 0x81a2, 3)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card Modem */
drivers/usb/serial/sierra.c +43 -12
119 lines not on this page · raw message
drivers/usb/serial/usb_wwan.c +67 -58
227 lines not on this page · raw message
drivers/video/matrox/matroxfb_base.h +1 -1
@@ -698,7 +698,7 @@ void matroxfb_unregister_driver(struct matroxfb_driver* drv);#define mga_fifo (n) do {} while ((mga_inl(M_FIFOSTATUS) & 0xFF) < (n)) -#define WaitTillIdle () do {} while (mga_inl(M_STATUS) & 0x10000) +#define WaitTillIdle () do { mga_inl(M_STATUS); do {} while (mga_inl(M_STATUS) & 0x10000); } while (0)/* code speedup */ #ifdef CONFIG_FB_MATROX_MILLENIUM
fs/aio.c +3 -3
@@ -310,7 +310,6 @@ static void free_ioctx(struct kioctx *ctx) avail = (head <= ctx->tail ? ctx->tail : ctx->nr_events) - head; -atomic_sub (avail, &ctx->reqs_active); head += avail; head %= ctx->nr_events; }
@@ -678,6 +677,7 @@ void aio_complete(struct kiocb *iocb, long res, long res2) put_rq:/* everything turned out well, dispose of the aiocb. */ aio_put_req (iocb); +atomic_dec (&ctx->reqs_active);/* * We have to order our ring_info tail store above and test
@@ -717,6 +717,8 @@ static long aio_read_events_ring(struct kioctx *ctx,if (head == ctx->tail) goto out; + head %= ctx->nr_events; +while (ret < nr) {long avail;struct io_event *ev;
@@ -755,8 +757,6 @@ static long aio_read_events_ring(struct kioctx *ctx,flush_dcache_page (ctx->ring_pages[0 ]);pr_debug ("%li h%u t%u\n" , ret, head, ctx->tail); - -atomic_sub (ret, &ctx->reqs_active); out:mutex_unlock (&ctx->ring_lock);
fs/btrfs/backref.c +20 -12
@@ -1347,9 +1347,10 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical,* returns <0 on error */ static int __get_extent_inline_ref (unsigned long *ptr,struct extent_buffer *eb, -struct btrfs_extent_item *ei,u32 item_size, -struct btrfs_extent_inline_ref **out_eiref, -int *out_type) +struct btrfs_key *key, +struct btrfs_extent_item *ei,u32 item_size, +struct btrfs_extent_inline_ref **out_eiref, +int *out_type) {unsigned long end;u64 flags;
@@ -1359,19 +1360,26 @@ static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb,/* first call */ flags =btrfs_extent_flags (eb, ei);if (flags &BTRFS_EXTENT_FLAG_TREE_BLOCK ) { - info = (struct btrfs_tree_block_info *)(ei +1 ); - *out_eiref = - (struct btrfs_extent_inline_ref *)(info +1 ); +if (key->type ==BTRFS_METADATA_ITEM_KEY ) { +/* a skinny metadata extent */ + *out_eiref = + (struct btrfs_extent_inline_ref *)(ei +1 ); + }else { +WARN_ON (key->type !=BTRFS_EXTENT_ITEM_KEY ); + info = (struct btrfs_tree_block_info *)(ei +1 ); + *out_eiref = + (struct btrfs_extent_inline_ref *)(info +1 ); + } }else { *out_eiref = (struct btrfs_extent_inline_ref *)(ei +1 ); } *ptr = (unsigned long )*out_eiref; -if ((void *)*ptr >= (void *)ei + item_size) +if ((unsigned long )(*ptr) >= (unsigned long )ei + item_size)return -ENOENT ; } end = (unsigned long )ei + item_size; - *out_eiref = (struct btrfs_extent_inline_ref *)*ptr; + *out_eiref = (struct btrfs_extent_inline_ref *)(*ptr); *out_type =btrfs_extent_inline_ref_type (eb, *out_eiref); *ptr +=btrfs_extent_inline_ref_size (*out_type);
@@ -1390,8 +1398,8 @@ static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb,* <0 on error. */ int tree_backref_for_extent (unsigned long *ptr,struct extent_buffer *eb, -struct btrfs_extent_item *ei,u32 item_size, -u64 *out_root,u8 *out_level) +struct btrfs_key *key,struct btrfs_extent_item *ei, +u32 item_size,u64 *out_root,u8 *out_level) {int ret;int type;
@@ -1402,8 +1410,8 @@ int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb,return 1 ;while (1 ) { - ret =__get_extent_inline_ref (ptr, eb, ei, item_size, - &eiref, &type); + ret =__get_extent_inline_ref (ptr, eb, key, ei, item_size, + &eiref, &type);if (ret <0 )return ret;
fs/btrfs/backref.h +2 -2
@@ -42,8 +42,8 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, u64 *flags);int tree_backref_for_extent (unsigned long *ptr,struct extent_buffer *eb, -struct btrfs_extent_item *ei,u32 item_size, -u64 *out_root,u8 *out_level); +struct btrfs_key *key,struct btrfs_extent_item *ei, +u32 item_size,u64 *out_root,u8 *out_level); int iterate_extent_inodes(struct btrfs_fs_info *fs_info, u64 extent_item_objectid,
fs/btrfs/disk-io.c +5 -0
@@ -3518,6 +3518,11 @@ int close_ctree(struct btrfs_root *root)btrfs_free_block_groups (fs_info); +/* +* we must make sure there is not any read request to +* submit after we stopping all workers. +*/ +invalidate_inode_pages2 (fs_info->btree_inode->i_mapping);btrfs_stop_all_workers (fs_info);del_fs_roots (fs_info);
fs/btrfs/extent_io.c +4 -1
@@ -1624,6 +1624,7 @@ again:* shortening the size of the delalloc range we're searching */ free_extent_state (cached_state); + cached_state =NULL ;if (!loops) {unsigned long offset = (*start) & (PAGE_CACHE_SIZE -1 ); max_bytes =PAGE_CACHE_SIZE - offset;
@@ -2356,7 +2357,7 @@ int end_extent_writepage(struct page *page, int err, u64 start, u64 end) {int uptodate = (err ==0 );struct extent_io_tree *tree; -int ret; +int ret =0 ; tree = &BTRFS_I (page->mapping->host)->io_tree;
@@ -2370,6 +2371,8 @@ int end_extent_writepage(struct page *page, int err, u64 start, u64 end)if (!uptodate) {ClearPageUptodate (page);SetPageError (page); + ret = ret <0 ? ret : -EIO ; +mapping_set_error (page->mapping, ret); }return 0 ; }
fs/btrfs/free-space-cache.c +2 -2
@@ -835,7 +835,7 @@ int load_free_space_cache(struct btrfs_fs_info *fs_info,if (!matched) {__btrfs_remove_free_space_cache (ctl); -btrfs_err (fs_info,"block group %llu has wrong amount of free space" , +btrfs_warn (fs_info,"block group %llu has wrong amount of free space" , block_group->key.objectid); ret =-1 ; }
@@ -847,7 +847,7 @@ out:spin_unlock (&block_group->lock); ret =0 ; -btrfs_err (fs_info,"failed to load free space cache for block group %llu" , +btrfs_warn (fs_info,"failed to load free space cache for block group %llu, rebuild it now" , block_group->key.objectid); }
fs/btrfs/scrub.c +3 -2
@@ -545,8 +545,9 @@ static void scrub_print_warning(const char *errstr, struct scrub_block *sblock)if (flags &BTRFS_EXTENT_FLAG_TREE_BLOCK ) { do { - ret = tree_backref_for_extent(&ptr, eb, ei, item_size, - &ref_root, &ref_level); + ret = tree_backref_for_extent(&ptr, eb, &found_key, ei, + item_size, &ref_root, + &ref_level); printk_in_rcu(KERN_WARNING "btrfs: %s at logical %llu on dev %s, " "sector %llu: metadata %s (level %d) in tree "
fs/btrfs/send.c +4 -0
@@ -1550,6 +1550,10 @@ static int lookup_dir_item_inode(struct btrfs_root *root, goto out; }btrfs_dir_item_key_to_cpu (path->nodes[0 ], di, &key); +if (key.type ==BTRFS_ROOT_ITEM_KEY ) { + ret = -ENOENT ; + goto out; + } *found_inode = key.objectid; *found_type =btrfs_dir_type (path->nodes[0 ], di);
fs/btrfs/volumes.c +27 -5
@@ -1384,6 +1384,22 @@ out:return ret; } +/* +* Function to update ctime/mtime for a given device path. +* Mainly used for ctime/mtime based probe like libblkid. +*/ +static void update_dev_time (char *path_name) +{ +struct file *filp; + + filp =filp_open (path_name,O_RDWR ,0 ); +if (!filp) +return ; +file_update_time (filp); +filp_close (filp,NULL ); +return ; +} +static int btrfs_rm_dev_item (struct btrfs_root *root,struct btrfs_device *device) {
@@ -1612,11 +1628,12 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path)struct btrfs_fs_devices *fs_devices; fs_devices = root->fs_info->fs_devices;while (fs_devices) { -if (fs_devices->seed == cur_devices) +if (fs_devices->seed == cur_devices) { + fs_devices->seed = cur_devices->seed;break ; + } fs_devices = fs_devices->seed; } - fs_devices->seed = cur_devices->seed; cur_devices->seed =NULL ;lock_chunks (root);__btrfs_close_devices (cur_devices);
@@ -1642,10 +1659,14 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) ret =0 ; -/* Notify udev that device has changed */ -if (bdev) +if (bdev) { +/* Notify udev that device has changed */ btrfs_kobject_uevent (bdev,KOBJ_CHANGE ); +/* Update ctime/mtime for device path for libblkid */ +update_dev_time (device_path); + } + error_brelse:brelse (bh);if (bdev)
@@ -1817,7 +1838,6 @@ static int btrfs_prepare_sprout(struct btrfs_root *root) fs_devices->seeding =0 ; fs_devices->num_devices =0 ; fs_devices->open_devices =0 ; - fs_devices->total_devices =0 ; fs_devices->seed = seed_devices;generate_random_uuid (fs_devices->fsid);
@@ -2089,6 +2109,8 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path) ret =btrfs_commit_transaction (trans, root); } +/* Update ctime/mtime for libblkid */ +update_dev_time (device_path);return ret; error_trans:
fs/ext4/mballoc.c +1 -1
@@ -3116,7 +3116,7 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, }BUG_ON (start + size <= ac->ac_o_ex.fe_logical && start > ac->ac_o_ex.fe_logical); -BUG_ON (size <=0 || size >EXT4_CLUSTERS_PER_GROUP (ac->ac_sb)); +BUG_ON (size <=0 || size >EXT4_BLOCKS_PER_GROUP (ac->ac_sb));/* now prepare goal request */
fs/ext4/page-io.c +11 -13
@@ -384,6 +384,17 @@ int ext4_bio_write_page(struct ext4_io_submit *io,ClearPageError (page);/* +* Comments copied from block_write_full_page_endio: +* +* The page straddles i_size. It must be zeroed out on each and every +* writepage invocation because it may be mmapped. "A file is mapped +* in multiples of the page size. For a file that is not a multiple of +* the page size, the remaining memory is zeroed when mapped, and +* writes to that region are not written out to the file." +*/ +if (len <PAGE_CACHE_SIZE ) +zero_user_segment (page, len,PAGE_CACHE_SIZE ); +/* * In the first loop we prepare and mark buffers to submit. We have to * mark all buffers in the page before submitting so that * end_page_writeback() cannot be called from ext4_bio_end_io() when IO
@@ -394,19 +405,6 @@ int ext4_bio_write_page(struct ext4_io_submit *io, do { block_start = bh_offset(bh); if (block_start >= len) { - /* - * Comments copied from block_write_full_page_endio: - * - * The page straddles i_size. It must be zeroed out on - * each and every writepage invocation because it may - * be mmapped. "A file is mapped in multiples of the - * page size. For a file that is not a multiple of - * the page size, the remaining memory is zeroed when - * mapped, and writes to that region are not written - * out to the file." - */ - zero_user_segment(page, block_start, - block_start + blocksize); clear_buffer_dirty(bh); set_buffer_uptodate(bh); continue;
include/linux/irqdesc.h +4 -0
@@ -27,6 +27,8 @@ struct irq_desc;* @irq_count: stats field to detect stalled irqs * @last_unhandled: aging timer for unhandled count * @irqs_unhandled: stats field for spurious unhandled interrupts +* @threads_handled: stats field for deferred spurious detection of threaded handlers +* @threads_handled_last: comparator field for deferred spurious detection of theraded handlers * @lock: locking for SMP * @affinity_hint: hint to user space for preferred irq affinity * @affinity_notify: context for notification of affinity changes
@@ -52,6 +54,8 @@ struct irq_desc {unsigned int irq_count;/* For detecting broken IRQs */ unsigned long last_unhandled;/* Aging timer for unhandled count */ unsigned int irqs_unhandled; +atomic_t threads_handled; +int threads_handled_last;raw_spinlock_t lock;struct cpumask *percpu_enabled;#ifdef CONFIG_SMP
include/linux/ptrace.h +32 -0
@@ -5,6 +5,7 @@#include <linux/sched.h> /* For struct task_struct. */ #include <linux/err.h> /* for IS_ERR_VALUE */ #include <linux/bug.h> /* For BUG_ON. */ +#include <linux/pid_namespace.h> /* For task_active_pid_ns. */ #include <uapi/linux/ptrace.h> /*
@@ -129,6 +130,37 @@ static inline void ptrace_event(int event, unsigned long message) }/** +* ptrace_event_pid - possibly stop for a ptrace event notification +* @event: %PTRACE_EVENT_* value to report +* @pid: process identifier for %PTRACE_GETEVENTMSG to return +* +* Check whether @event is enabled and, if so, report @event and @pid +* to the ptrace parent. @pid is reported as the pid_t seen from the +* the ptrace parent's pid namespace. +* +* Called without locks. +*/ +static inline void ptrace_event_pid (int event,struct pid *pid) +{ +/* +* FIXME: There's a potential race if a ptracer in a different pid +* namespace than parent attaches between computing message below and +* when we acquire tasklist_lock in ptrace_stop(). If this happens, +* the ptracer will get a bogus pid from PTRACE_GETEVENTMSG. +*/ +unsigned long message =0 ; +struct pid_namespace *ns; + +rcu_read_lock (); + ns =task_active_pid_ns (rcu_dereference (current->parent)); +if (ns) + message =pid_nr_ns (pid, ns); +rcu_read_unlock (); + +ptrace_event (event, message); +} + +/** * ptrace_init_task - initialize ptrace state for a new child * @child: new child task * @ptrace: true if child should be ptrace'd by parent's tracer
include/target/target_core_backend.h +1 -0
@@ -50,6 +50,7 @@ int transport_subsystem_register(struct se_subsystem_api *);void transport_subsystem_release (struct se_subsystem_api *);void target_complete_cmd (struct se_cmd *,u8 ); +void target_complete_cmd_with_length (struct se_cmd *,u8 ,int );sense_reason_t spc_parse_cdb (struct se_cmd *cmd,unsigned int *size);sense_reason_t spc_emulate_report_luns (struct se_cmd *cmd);
kernel/fork.c +7 -3
@@ -1607,10 +1607,12 @@ long do_fork(unsigned long clone_flags,*/ if (!IS_ERR (p)) {struct completion vfork; +struct pid *pid;trace_sched_process_fork (current, p); - nr =task_pid_vnr (p); + pid =get_task_pid (p,PIDTYPE_PID ); + nr =pid_vnr (pid);if (clone_flags &CLONE_PARENT_SETTID )put_user (nr, parent_tidptr);
@@ -1625,12 +1627,14 @@ long do_fork(unsigned long clone_flags,/* forking complete and child started to run, tell ptracer */ if (unlikely (trace)) -ptrace_event (trace, nr); +ptrace_event_pid (trace, pid);if (clone_flags &CLONE_VFORK ) {if (!wait_for_vfork_done (p, &vfork)) -ptrace_event (PTRACE_EVENT_VFORK_DONE , nr); +ptrace_event_pid (PTRACE_EVENT_VFORK_DONE , pid); } + +put_pid (pid); }else { nr =PTR_ERR (p); }
kernel/irq/manage.c +2 -2
@@ -861,8 +861,8 @@ static int irq_thread(void *data)irq_thread_check_affinity (desc, action); action_ret =handler_fn (desc, action); -if (!noirqdebug) -note_interrupt (action->irq, desc, action_ret); +if (action_ret ==IRQ_HANDLED ) +atomic_inc (&desc->threads_handled);wake_threads_waitq (desc); }
kernel/irq/spurious.c +102 -4
123 lines not on this page · raw message
lib/idr.c +3 -5
@@ -250,7 +250,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa, id = (id | ((1 << (IDR_BITS * l)) -1 )) +1 ;/* if already at the top layer, we need to grow */ -if (id >=1 << (idp->layers *IDR_BITS )) { +if (id >idr_max (idp->layers)) { *starting_id = id;return -EAGAIN ; }
@@ -829,12 +829,10 @@ void *idr_replace(struct idr *idp, void *ptr, int id)if (!p)return ERR_PTR (-EINVAL ); - n = (p->layer+1 ) *IDR_BITS ; - -if (id >= (1 << n)) +if (id >idr_max (p->layer +1 ))return ERR_PTR (-EINVAL ); - n -=IDR_BITS ; + n = p->layer *IDR_BITS ;while ((n >0 ) && p) { p = p->ary[(id >> n) &IDR_MASK ]; n -=IDR_BITS ;
mm/memory-failure.c +14 -11
@@ -208,9 +208,9 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,#endif si.si_addr_lsb =compound_trans_order (compound_head (page)) +PAGE_SHIFT ; -if ((flags &MF_ACTION_REQUIRED ) && t == current) { +if ((flags &MF_ACTION_REQUIRED ) && t->mm == current->mm) { si.si_code =BUS_MCEERR_AR ; - ret =force_sig_info (SIGBUS , &si, t); + ret =force_sig_info (SIGBUS , &si, current); }else {/* * Don't use force here, it's convenient if the signal
@@ -382,10 +382,12 @@ static void kill_procs(struct list_head *to_kill, int forcekill, int trapno, } } -static int task_early_kill (struct task_struct *tsk) +static int task_early_kill (struct task_struct *tsk,int force_early) {if (!tsk->mm)return 0 ; +if (force_early) +return 1 ;if (tsk->flags &PF_MCE_PROCESS )return !!(tsk->flags &PF_MCE_EARLY );return sysctl_memory_failure_early_kill;
@@ -395,7 +397,7 @@ static int task_early_kill(struct task_struct *tsk)* Collect processes when the error hit an anonymous page. */ static void collect_procs_anon (struct page *page,struct list_head *to_kill, -struct to_kill **tkc) +struct to_kill **tkc,int force_early) {struct vm_area_struct *vma;struct task_struct *tsk;
@@ -411,7 +413,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill,for_each_process (tsk) {struct anon_vma_chain *vmac; -if (!task_early_kill (tsk)) +if (!task_early_kill (tsk, force_early))continue ;anon_vma_interval_tree_foreach (vmac, &av->rb_root, pgoff, pgoff) {
@@ -430,7 +432,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill,* Collect processes when the error hit a file mapped page. */ static void collect_procs_file (struct page *page,struct list_head *to_kill, -struct to_kill **tkc) +struct to_kill **tkc,int force_early) {struct vm_area_struct *vma;struct task_struct *tsk;
@@ -441,7 +443,7 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill,for_each_process (tsk) {pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT -PAGE_SHIFT ); -if (!task_early_kill (tsk)) +if (!task_early_kill (tsk, force_early))continue ; vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff,
@@ -467,7 +469,8 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill,* First preallocate one tokill structure outside the spin locks, * so that we can kill at least one process reasonably reliable. */ -static void collect_procs (struct page *page,struct list_head *tokill) +static void collect_procs (struct page *page,struct list_head *tokill, +int force_early) {struct to_kill *tk;
@@ -478,9 +481,9 @@ static void collect_procs(struct page *page, struct list_head *tokill)if (!tk)return ;if (PageAnon (page)) -collect_procs_anon (page, tokill, &tk); +collect_procs_anon (page, tokill, &tk, force_early);else -collect_procs_file (page, tokill, &tk); +collect_procs_file (page, tokill, &tk, force_early);kfree (tk); }
@@ -965,7 +968,7 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn,* there's nothing that can be done. */ if (kill) -collect_procs (ppage, &tokill); +collect_procs (ppage, &tokill, flags &MF_ACTION_REQUIRED ); ret =try_to_unmap (ppage, ttu);if (ret !=SWAP_SUCCESS )
mm/rmap.c +5 -3
@@ -103,6 +103,7 @@ static inline void anon_vma_free(struct anon_vma *anon_vma)* LOCK should suffice since the actual taking of the lock must * happen _before_ what follows. */ +might_sleep ();if (rwsem_is_locked (&anon_vma->root->rwsem)) {anon_vma_lock_write (anon_vma);anon_vma_unlock_write (anon_vma);
@@ -426,8 +427,9 @@ struct anon_vma *page_get_anon_vma(struct page *page)* above cannot corrupt). */ if (!page_mapped (page)) { +rcu_read_unlock ();put_anon_vma (anon_vma); - anon_vma =NULL ; +return NULL ; } out:rcu_read_unlock ();
@@ -477,9 +479,9 @@ struct anon_vma *page_lock_anon_vma_read(struct page *page) }if (!page_mapped (page)) { +rcu_read_unlock ();put_anon_vma (anon_vma); - anon_vma =NULL ; - goto out; +return NULL ; }/* we pinned the anon_vma, its safe to sleep */
mm/vmscan.c +40 -6
76 lines not on this page · raw message
net/bluetooth/l2cap_sock.c +4 -1
@@ -949,13 +949,16 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(struct l2cap_chan *chan)/* Check for backlog size */ if (sk_acceptq_is_full (parent)) {BT_DBG ("backlog full %d" , parent->sk_ack_backlog); +release_sock (parent);return NULL ; } sk =l2cap_sock_alloc (sock_net (parent),NULL ,BTPROTO_L2CAP ,GFP_ATOMIC ); -if (!sk) +if (!sk) { +release_sock (parent);return NULL ; + }bt_sock_reclassify_lock (sk,BTPROTO_L2CAP );
net/core/skbuff.c +2 -0
@@ -2844,6 +2844,8 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)skb_shinfo (nskb)->tx_flags =skb_shinfo (skb)->tx_flags &SKBTX_SHARED_FRAG ;while (pos < offset + len && i < nfrags) { +if (unlikely (skb_orphan_frags (skb,GFP_ATOMIC ))) + goto err; *frag =skb_shinfo (skb)->frags[i];__skb_frag_ref (frag); size =skb_frag_size (frag);
net/iucv/af_iucv.c +1 -1
@@ -1829,7 +1829,7 @@ static void iucv_callback_txdone(struct iucv_path *path,spin_lock_irqsave (&list->lock, flags);while (list_skb != (struct sk_buff *)list) { -if (msg->tag !=IUCV_SKB_CB (list_skb)->tag) { +if (msg->tag ==IUCV_SKB_CB (list_skb)->tag) { this = list_skb;break ; }