Linux 3.14.5
Greg KH
maintainerI'm announcing the release of the 3.14.5 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.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 | 4 arch/parisc/include/asm/shmparam.h | 5 - arch/parisc/include/uapi/asm/resource.h | 1 arch/parisc/kernel/cache.c | 3 arch/parisc/kernel/sys_parisc.c | 14 +-- arch/parisc/kernel/syscall_table.S | 2 arch/s390/net/bpf_jit_comp.c | 2 arch/x86/include/asm/preempt.h | 12 ++ arch/x86/kvm/x86.c | 1 arch/x86/net/bpf_jit_comp.c | 2 arch/x86/xen/spinlock.c | 5 - block/blk-core.c | 2 drivers/block/rbd.c | 2 drivers/gpu/drm/i915/i915_drv.h | 1 drivers/gpu/drm/i915/i915_trace.h | 4 drivers/gpu/drm/i915/intel_display.c | 16 +++ drivers/gpu/drm/i915/intel_panel.c | 4 drivers/gpu/drm/i915/intel_tv.c | 9 +- drivers/gpu/drm/qxl/qxl_ttm.c | 1 drivers/gpu/drm/radeon/cik.c | 6 - drivers/gpu/drm/radeon/radeon_display.c | 1 drivers/gpu/drm/radeon/radeon_ring.c | 1 drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 22 ++++ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 5 - drivers/hid/hid-core.c | 5 - drivers/hid/hid-ids.h | 3 drivers/hid/hid-microsoft.c | 4 drivers/hid/usbhid/hid-quirks.c | 1 drivers/md/raid1.c | 17 ++- drivers/net/bonding/bond_main.c | 1 drivers/net/bonding/bond_options.c | 1 drivers/net/ethernet/broadcom/tg3.c | 4 drivers/net/ethernet/mellanox/mlx4/en_cq.c | 1 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 6 - drivers/net/ethernet/mellanox/mlx4/main.c | 3 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 drivers/net/ethernet/sfc/nic.c | 14 +-- drivers/net/macvlan.c | 21 +++- drivers/net/macvtap.c | 9 ++ drivers/net/phy/phy_device.c | 4 drivers/net/slip/slip.c | 6 - drivers/net/usb/cdc_mbim.c | 57 +++++++++--- drivers/net/usb/cdc_ncm.c | 2 drivers/net/usb/qmi_wwan.c | 28 ++++++ drivers/net/wireless/ti/wl18xx/event.h | 20 ++++ drivers/scsi/megaraid/megaraid_mm.c | 2 drivers/scsi/scsi_scan.c | 112 +++++++++++++++---------- drivers/scsi/scsi_sysfs.c | 20 +++- drivers/tty/serial/omap-serial.c | 29 +++--- drivers/usb/class/cdc-acm.c | 28 ++++-- drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/ftdi_sio.c | 33 +++++++ drivers/usb/serial/ftdi_sio_ids.h | 37 ++++++++ drivers/usb/serial/io_ti.c | 50 +++++++---- drivers/usb/serial/option.c | 83 +++++++++++++++++- drivers/usb/serial/qcserial.c | 9 ++ drivers/usb/serial/sierra.c | 1 drivers/usb/serial/usb-serial.c | 4 drivers/usb/serial/usb_wwan.c | 9 -- drivers/xen/events/events_fifo.c | 41 ++++++--- fs/cifs/cifsfs.c | 14 ++- fs/cifs/cifsglob.h | 8 + fs/cifs/cifsproto.h | 3 fs/cifs/file.c | 31 ++++++ fs/cifs/misc.c | 74 ++++++++++++++++ fs/cifs/smb1ops.c | 11 ++ fs/cifs/smb2misc.c | 18 +++- fs/cifs/smb2ops.c | 14 +++ fs/file_table.c | 4 fs/open.c | 26 +---- fs/super.c | 5 - include/asm-generic/pgtable.h | 31 +++++- include/linux/if_macvlan.h | 1 include/linux/if_vlan.h | 3 include/linux/net.h | 15 --- include/linux/netdevice.h | 18 +++- include/linux/preempt.h | 2 include/linux/rtnetlink.h | 5 + include/linux/sched.h | 20 ++++ include/linux/sock_diag.h | 2 include/linux/thread_info.h | 2 include/net/af_vsock.h | 6 + include/net/ip6_route.h | 5 + include/net/netfilter/nf_conntrack_extend.h | 4 include/net/netfilter/nf_tables_core.h | 10 ++ include/net/sctp/structs.h | 18 +++- include/scsi/scsi_device.h | 3 include/trace/events/block.h | 33 ++++++- init/Kconfig | 24 ++--- kernel/audit.c | 4 kernel/auditsc.c | 2 kernel/time/tick-common.c | 2 kernel/time/tick-sched.c | 5 - kernel/trace/blktrace.c | 20 ++-- kernel/trace/trace_events_trigger.c | 2 kernel/trace/trace_uprobe.c | 6 + kernel/tracepoint.c | 6 + mm/huge_memory.c | 13 ++ mm/hugetlb.c | 1 net/8021q/vlan.c | 1 net/8021q/vlan_dev.c | 13 +- net/batman-adv/bat_iv_ogm.c | 2 net/batman-adv/distributed-arp-table.c | 3 net/batman-adv/fragmentation.c | 11 +- net/batman-adv/gateway_client.c | 11 ++ net/batman-adv/originator.c | 62 ++++++++++++- net/bridge/br_input.c | 2 net/bridge/br_netlink.c | 15 +++ net/bridge/br_vlan.c | 7 - net/bridge/netfilter/ebtables.c | 5 - net/core/dev.c | 56 ++++++++++++ net/core/filter.c | 6 + net/core/neighbour.c | 4 net/core/net_namespace.c | 2 net/core/rtnetlink.c | 66 ++++++++++++-- net/core/skbuff.c | 16 ++- net/core/sock_diag.c | 4 net/core/utils.c | 8 - net/ipv4/fib_semantics.c | 2 net/ipv4/ip_forward.c | 4 net/ipv4/ip_gre.c | 2 net/ipv4/ip_tunnel.c | 6 + net/ipv4/ip_vti.c | 2 net/ipv4/netfilter/arp_tables.c | 6 - net/ipv4/netfilter/ip_tables.c | 6 - net/ipv4/ping.c | 15 ++- net/ipv4/route.c | 4 net/ipv4/tcp_cubic.c | 2 net/ipv6/ip6_fib.c | 3 net/ipv6/ip6_gre.c | 10 ++ net/ipv6/ip6_offload.c | 6 - net/ipv6/ip6_output.c | 8 + net/ipv6/ip6_tunnel.c | 2 net/ipv6/netfilter/ip6_tables.c | 6 - net/ipv6/route.c | 5 - net/ipv6/tcpv6_offload.c | 2 net/l2tp/l2tp_ppp.c | 4 net/netfilter/nf_tables_api.c | 3 net/netfilter/nf_tables_core.c | 3 net/netfilter/nft_cmp.c | 2 net/packet/diag.c | 2 net/sched/cls_tcindex.c | 30 ++++-- net/sched/sch_hhf.c | 11 +- net/sctp/associola.c | 82 ++++++++++++++---- net/sctp/auth.c | 17 +-- net/sctp/endpointola.c | 3 net/sctp/protocol.c | 7 + net/sctp/sm_make_chunk.c | 32 +++---- net/sctp/sm_sideeffect.c | 7 - net/sctp/sm_statefuns.c | 8 - net/sctp/socket.c | 102 ++++++++++++++++------ net/sctp/sysctl.c | 36 +++++++- net/sctp/ulpevent.c | 8 - net/vmw_vsock/af_vsock.c | 47 ++++------ tools/lib/traceevent/event-parse.c | 1 156 files changed, 1546 insertions(+), 509 deletions(-)
Al Viro (1):
don't bother with {get,put}_write_access() on non-regular files
Alex Deucher (3):
drm/radeon: call drm_edid_to_eld when we update the edid drm/radeon: fix endian swap on hawaii clear state buffer setup drm/radeon: fix typo in spectre_golden_registers
Alexei Starovoitov (1):
net: filter: x86: fix JIT address randomization
Andrew Lutomirski (1):
net: Fix ns_capable check in sock_diag_put_filterinfo
Andrey Vagin (1):
netfilter: nf_conntrack: reserve two bytes for nf_ct_ext->len
Andy King (1):
vsock: Make transport the proto owner
Antonio Quartulli (3):
batman-adv: fix reference counting imbalance while sending fragment
batman-adv: increase orig refcount when storing ref in gw_node
batman-adv: fix local TT check for outgoing arp requests in DAT
Benjamin Tissoires (1):
HID: core: do not scan constant input report
Bjørn Mork (16):
usb: qcserial: add Sierra Wireless EM7355
usb: qcserial: add Sierra Wireless MC73xx
usb: qcserial: add Sierra Wireless MC7305/MC7355
usb: option: add Olivetti Olicard 500
usb: option: add Alcatel L800MA
usb: option: add and update a number of CMOTech devices
net: qmi_wwan: add Sierra Wireless EM7355
net: qmi_wwan: add Sierra Wireless MC73xx
net: qmi_wwan: add Sierra Wireless MC7305/MC7355
net: qmi_wwan: add Olivetti Olicard 500
net: qmi_wwan: add Alcatel L800MA
net: qmi_wwan: add a number of CMOTech devices
net: qmi_wwan: add a number of Dell devices
net: cdc_ncm: fix buffer overflow
net: cdc_mbim: __vlan_find_dev_deep need rcu_read_lock
net: cdc_mbim: handle unaccelerated VLAN tagged frames
Chris Mason (1):
mlx4_en: don't use napi_synchronize inside mlx4_en_netpoll
Christian König (1):
drm/radeon: clear needs_reset flag if IB test fails
Christopher Friedt (1):
drm/vmwgfx: correct fb_fix_screeninfo.line_length
Cong Wang (2):
rtnetlink: wait for unregistering devices in rtnl_link_unregister()
net_sched: fix an oops in tcindex filter
Dan Carpenter (1):
SCSI: megaraid: missing bounds check in mimd_to_kioc()
Daniel Borkmann (3):
net: sctp: wake up all assocs if sndbuf policy is per socket
net: sctp: test if association is dead in sctp_wake_up_waiters
Revert "net: sctp: Fix a_rwnd/rwnd management to reflect real state of the receiver's buffer"
Daniele Palmas (1):
usb: option driver, add support for Telit UE910v2
David Gibson (2):
rtnetlink: Warn when interface's information won't fit in our packet
rtnetlink: Only supply IFLA_VF_PORTS information when RTEXT_FILTER_VF is set
Derya (1):
Revert "HID: microsoft: Add ID's for Surface Type/Touch Cover 2"
Dmitry Petukhov (1):
l2tp: take PMTU from tunnel UDP socket
Duan Jiong (1):
neigh: set nud_state to NUD_INCOMPLETE when probing router reachability
Eliad Peller (1):
wl18xx: align event mailbox with current fw
Eric Dumazet (4):
ipv6: Limit mtu to 65575 bytes
net: gro: make sure skb->cb[] initial content has not to be zero
ipv6: gro: fix CHECKSUM_COMPLETE support
net-gro: reset skb->truesize in napi_reuse_skb()
Eyal Perry (1):
net/mlx4_core: Don't issue PCIe speed/width checks for VFs
Florian Westphal (3):
net: core: don't account for udp header size when computing seglen
net: ipv4: ip_forward: fix inverted local_df test
net: ipv6: send pkttoobig immediately if orig frag size > mtu
Greg Kroah-Hartman (1):
Linux 3.14.5
Guenter Roeck (1):
net: phy: Don't call phy_resume if phy_init_hw failed
Hannes Frederic Sowa (2):
net: avoid dependency of net_get_random_once on nop patching
ipv6: fix calculation of option len in ip6_append_data
Hans de Goede (1):
HID: add NO_INIT_REPORTS quirk for Synaptics Touch Pad V 103S
Heiko Carstens (1):
net: filter: s390: fix JIT address randomization
Helge Deller (2):
parisc: change value of SHMLBA from 0x00400000 to PAGE_SIZE
parisc: fix epoll_pwait syscall on compat kernel
Ilya Dryomov (1):
rbd: fix error paths in rbd_img_request_fill()
Ivan Vecera (1):
tg3: update rx_jumbo_pending ring param only when jumbo frames are enabled
James Bottomley (2):
scsi: fix our current target reap infrastructure
SCSI: dual scan thread bug fix
Jani Nikula (2):
drm/i915: restore QUIRK_NO_PCH_PWM_ENABLE drm/i915/tv: fix gen4 composite s-video tv-out
Johan Hovold (4):
USB: usb_wwan: fix handling of missing bulk endpoints Revert "USB: serial: add usbid for dell wwan card to sierra.c"
USB: serial: fix sysfs-attribute removal deadlock
USB: io_ti: fix firmware download on big-endian machines
John David Anglin (1):
parisc: remove _STK_LIM_MAX override
John Fastabend (1):
net: sched: lock imbalance in hhf qdisc
Julian Anastasov (1):
ipv4: return valid RTA_IIF on ip route get
Karl Heiss (1):
net: sctp: Don't transition to PF state when transport has exhausted 'Path.Max.Retrans'.
Kirill A. Shutemov (1):
thp: close race between split and zap huge pages
Konrad Rzeszutek Wilk (1):
xen/spinlock: Don't enable them unconditionally.
Kumar Sundararajan (1):
ipv6: fib: fix fib dump restart
Li RongQing (1):
ipv4: initialise the itag variable in __mkroute_input
Liu Yu (1):
tcp_cubic: fix the range of delayed_ack
Maarten Lankhorst (1):
drm/qxl: unset a pointer in sync_obj_unref
Marcelo Tosatti (1):
KVM: x86: remove WARN_ON from get_kernel_ns()
Marek Lindner (1):
batman-adv: fix indirect hard_iface NULL dereference
Mathias Krause (1):
filter: prevent nla extensions to peek beyond the end of the message
Mel Gorman (1):
mm: use paravirt friendly ops for NUMA hinting ptes
Michael Ulbricht (1):
USB: cdc-acm: Remove Motorola/Telit H24 serial interfaces from ACM driver
Michele Baldessari (1):
USB: serial: ftdi_sio: add id for Brainboxes serial cards
Mizuma, Masayoshi (1):
mm/hugetlb.c: add cond_resched_lock() in return_unused_surplus_pages()
NeilBrown (1):
md/raid1: r1buf_pool_alloc: free allocate pages when subsequent allocation fails.
Nicolas Dichtel (3):
gre: don't allow to add the same tunnel twice
vti: don't allow to add the same tunnel twice
ip6_gre: don't allow to remove the fb_tunnel_dev
Nikolay Aleksandrov (2):
sfc: fix calling of free_irq with already free vector
bonding: fix out of range parameters for bond_intmax_tbl
Oliver Hartkopp (1):
slip: fix spinlock variant
Pablo Neira Ayuso (1):
netfilter: nf_tables: set names cannot be larger than 15 bytes
Patrick McHardy (1):
netfilter: nf_tables: fix nft_cmp_fast failure on big endian for size < 4
Peter Christensen (1):
macvlan: Don't propagate IFF_ALLMULTI changes on down interfaces.
Peter Foley (1):
init/Kconfig: move the trusted keyring config option to general setup
Peter Zijlstra (1):
x86,preempt: Fix preemption for i386
Richard Guy Briggs (2):
pid: get pid_t ppid of task in init_pid_ns
audit: convert PPIDs to the inital PID namespace.
Roman Pen (1):
blktrace: fix accounting of partially completed requests
Sachin Prabhu (1):
cifs: Wait for writebacks to complete before attempting write.
Sergey Popovich (1):
ipv4: fib_semantics: increment fib_info_cnt after fib_info allocation
Simon Wunderlich (4):
batman-adv: fix neigh_ifinfo imbalance
batman-adv: fix neigh reference imbalance
batman-adv: always run purge_orig_neighbors
batman-adv: fix removing neigh_ifinfo
Steffen Klassert (1):
ip_tunnel: Initialize the fallback device properly
Steven Rostedt (2):
tools lib traceevent: Fix memory leak in pretty_print() drm/i915: Do not dereference pointers from ring buffer in evict event
Steven Rostedt (Red Hat) (2):
tracepoint: Do not waste memory on mods with no tracepoints
tracing: Use rcu_dereference_sched() for trace event triggers
Susant Sahani (1):
ip6_tunnel: fix potential NULL pointer dereference
Thomas Bächler (1):
fs: Don't return 0 from get_anon_bdev
Thomas Graf (1):
netfilter: Can't fail and free after table replacement
Thomas Hellstrom (2):
drm/vmwgfx: Fix query buffer locking order violation
drm/vmwgfx: Make sure user-space can't DMA across buffer object boundaries v2
Thomas Richter (1):
bonding: Remove debug_fs files when module init fails
Timo Teräs (1):
ipv4: ip_tunnels: disable cache for nbma gre tunnels
Tony Lindgren (1):
serial: omap: Fix missing pm_runtime_resume handling by simplifying code
Toshiaki Makita (2):
bridge: Fix double free and memory leak around br_allowed_ingress
bridge: Handle IFLA_ADDRESS correctly when creating bridge device
Tristan Bruns (1):
USB: cp210x: Add 8281 (Nanotec Plug & Drive)
Viresh Kumar (3):
tick-common: Fix wrong check in tick_check_replacement()
tick-sched: Don't call update_wall_time() when delta is lesser than tick_period
tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz()
Vlad Yasevich (8):
net: Start with correct mac_len in skb_network_protocol
net: Find the nesting level of a given device by type.
net: Allow for more then a single subclass for netif_addr_lock
vlan: Fix lockdep warning with stacked vlan devices.
macvlan: Fix lockdep warnings with stacked macvlan devices
net: sctp: cache auth_enable per endpoint
mactap: Fix checksum errors for non-gso packets in bridge mode Revert "macvlan : fix checksums error when we are in bridge mode"
Vladimir Murzin (1):
xen/events/fifo: correctly align bitops
Wang, Xiaoming (1):
net: ipv4: current group_info should be put after using.
Xufeng Zhang (1):
sctp: reset flowi4_oif parameter on route lookup
Ying Cai (1):
ip_tunnel: Set network header properly for IP_ECN_decapsulate()
dingtianhong (1):
vlan: Fix lockdep warning when vlan dev handle notification
zhangwei(Jovi) (1):
tracing/uprobes: Fix uprobe_cpu_buffer memory leak
Greg KH
maintainerMakefile +2 -2
@@ -1,8 +1,8 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = -NAME = Shuffling Zombie Juror +NAME = Remembering Coco # *DOCUMENTATION* # To see a list of typical targets execute "make help"
arch/parisc/include/asm/shmparam.h +2 -3
@@ -1,8 +1,7 @@#ifndef _ASMPARISC_SHMPARAM_H#define _ASMPARISC_SHMPARAM_H -#define __ARCH_FORCE_SHMLBA 1 - -#define SHMLBA 0x00400000/* attach addr needs to be 4 Mb aligned */ +#define SHMLBA PAGE_SIZE/* attach addr a multiple of this */ +#define SHM_COLOUR 0x00400000/* shared mappings colouring */ #endif /* _ASMPARISC_SHMPARAM_H */
arch/parisc/include/uapi/asm/resource.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_PARISC_RESOURCE_H#define _ASM_PARISC_RESOURCE_H -#define _STK_LIM_MAX 10 * _STK_LIM#include <asm-generic/resource.h> #endif
arch/parisc/kernel/cache.c +2 -1
@@ -323,7 +323,8 @@ void flush_dcache_page(struct page *page)* specifically accesses it, of course) */ flush_tlb_page (mpnt, addr); -if (old_addr ==0 || (old_addr & (SHMLBA -1 )) != (addr & (SHMLBA -1 ))) { +if (old_addr ==0 || (old_addr & (SHM_COLOUR -1 )) + != (addr & (SHM_COLOUR -1 ))) {__flush_cache_page (mpnt, addr,page_to_phys (page));if (old_addr)printk (KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %s\n" , old_addr, addr, mpnt->vm_file ? (char *)mpnt->vm_file->f_path.dentry->d_name.name :"(null)" );
arch/parisc/kernel/sys_parisc.c +7 -7
@@ -45,7 +45,7 @@static int get_offset (unsigned int last_mmap) { -return (last_mmap & (SHMLBA -1 )) >>PAGE_SHIFT ; +return (last_mmap & (SHM_COLOUR -1 )) >>PAGE_SHIFT ; } static unsigned long shared_align_offset(unsigned int last_mmap,
@@ -57,8 +57,8 @@ static unsigned long shared_align_offset(unsigned int last_mmap,static inline unsigned long COLOR_ALIGN (unsigned long addr,unsigned int last_mmap,unsigned long pgoff) { -unsigned long base = (addr+SHMLBA -1 ) & ~(SHMLBA -1 ); -unsigned long off = (SHMLBA -1 ) & +unsigned long base = (addr+SHM_COLOUR -1 ) & ~(SHM_COLOUR -1 ); +unsigned long off = (SHM_COLOUR -1 ) & (shared_align_offset (last_mmap, pgoff) <<PAGE_SHIFT );return base + off;
@@ -101,7 +101,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,if (flags &MAP_FIXED ) {if ((flags &MAP_SHARED ) && last_mmap && (addr -shared_align_offset (last_mmap, pgoff)) - & (SHMLBA -1 )) + & (SHM_COLOUR -1 ))return -EINVAL ; goto found_addr; }
@@ -122,7 +122,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, info.length = len; info.low_limit = mm->mmap_legacy_base; info.high_limit =mmap_upper_limit (); - info.align_mask = last_mmap ? (PAGE_MASK & (SHMLBA -1 )) :0 ; + info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR -1 )) :0 ; info.align_offset =shared_align_offset (last_mmap, pgoff); addr =vm_unmapped_area (&info);
@@ -161,7 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,if (flags &MAP_FIXED ) {if ((flags &MAP_SHARED ) && last_mmap && (addr -shared_align_offset (last_mmap, pgoff)) - & (SHMLBA -1 )) + & (SHM_COLOUR -1 ))return -EINVAL ; goto found_addr; }
@@ -182,7 +182,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, info.length = len; info.low_limit =PAGE_SIZE ; info.high_limit = mm->mmap_base; - info.align_mask = last_mmap ? (PAGE_MASK & (SHMLBA -1 )) :0 ; + info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR -1 )) :0 ; info.align_offset =shared_align_offset (last_mmap, pgoff); addr =vm_unmapped_area (&info);if (!(addr & ~PAGE_MASK ))
arch/parisc/kernel/syscall_table.S +1 -1
@@ -392,7 +392,7 @@ ENTRY_COMP(vmsplice) ENTRY_COMP(move_pages) /* 295 */ ENTRY_SAME(getcpu) - ENTRY_SAME(epoll_pwait) + ENTRY_COMP(epoll_pwait) ENTRY_COMP(statfs64) ENTRY_COMP(fstatfs64) ENTRY_COMP(kexec_load) /* 300 */
arch/s390/net/bpf_jit_comp.c +1 -1
@@ -811,7 +811,7 @@ static struct bpf_binary_header *bpf_alloc_binary(unsigned int bpfsize,return NULL ;memset (header,0 , sz); header->pages = sz /PAGE_SIZE ; - hole = sz - (bpfsize +sizeof (*header)); + hole =min (sz - (bpfsize +sizeof (*header)),PAGE_SIZE -sizeof (*header));/* Insert random number of illegal instructions before BPF code * and make sure the first instruction starts at an even address. */
arch/x86/include/asm/preempt.h +12 -0
@@ -5,6 +5,18 @@#include <asm/percpu.h> #include <linux/thread_info.h> +#ifdef CONFIG_X86_32 +/* +* i386's current_thread_info() depends on ESP and for interrupt/exception +* stacks this doesn't yield the actual task thread_info. +* +* We hard rely on the fact that all the TIF_NEED_RESCHED bits are +* the same, therefore use the slightly more expensive version below. +*/ +#undef tif_need_resched +#define tif_need_resched () test_tsk_thread_flag(current, TIF_NEED_RESCHED) +#endif +DECLARE_PER_CPU (int, __preempt_count);/*
arch/x86/kvm/x86.c +0 -1
@@ -1109,7 +1109,6 @@ static inline u64 get_kernel_ns(void) {struct timespec ts; -WARN_ON (preemptible ());ktime_get_ts (&ts);monotonic_to_bootbased (&ts);return timespec_to_ns (&ts);
arch/x86/net/bpf_jit_comp.c +1 -1
@@ -171,7 +171,7 @@ static struct bpf_binary_header *bpf_alloc_binary(unsigned int proglen,memset (header,0xcc , sz);/* fill whole space with int3 instructions */ header->pages = sz /PAGE_SIZE ; - hole = sz - (proglen +sizeof (*header)); + hole =min (sz - (proglen +sizeof (*header)),PAGE_SIZE -sizeof (*header));/* insert a random number of int3 instructions before BPF code */ *image_ptr = &header->image[prandom_u32 () % hole];
arch/x86/xen/spinlock.c +4 -1
@@ -274,7 +274,7 @@ void __init xen_init_spinlocks(void)printk (KERN_DEBUG "xen: PV spinlocks disabled\n" );return ; } - +printk (KERN_DEBUG "xen: PV spinlocks enabled\n" ); pv_lock_ops.lock_spinning =PV_CALLEE_SAVE (xen_lock_spinning); pv_lock_ops.unlock_kick = xen_unlock_kick; }
@@ -290,6 +290,9 @@ static __init int xen_init_spinlocks_jump(void)if (!xen_pvspin)return 0 ; +if (!xen_domain ()) +return 0 ; +static_key_slow_inc (¶virt_ticketlocks_enabled);return 0 ; }
block/blk-core.c +1 -1
@@ -2353,7 +2353,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)if (!req->bio)return false; -trace_block_rq_complete (req->q, req); +trace_block_rq_complete (req->q, req, nr_bytes);/* * For fs requests, rq is just carrier of independent bio's
drivers/block/rbd.c +1 -1
@@ -2253,7 +2253,7 @@ out_partial:rbd_obj_request_put (obj_request); out_unwind:for_each_obj_request_safe (img_request, obj_request, next_obj_request) -rbd_obj_request_put (obj_request); +rbd_img_obj_request_del (img_request, obj_request);return -ENOMEM ; }
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -734,6 +734,7 @@ enum intel_sbi_destination {#define QUIRK_PIPEA_FORCE (1<<0)#define QUIRK_LVDS_SSC_DISABLE (1<<1)#define QUIRK_INVERT_BRIGHTNESS (1<<2) +#define QUIRK_NO_PCH_PWM_ENABLE (1<<3)struct intel_fbdev ;struct intel_fbc_work ;
drivers/gpu/drm/i915/i915_trace.h +3 -1
@@ -238,14 +238,16 @@ TRACE_EVENT(i915_gem_evict_vm,TP_ARGS (vm),TP_STRUCT__entry ( + __field(u32, dev)__field (struct i915_address_space *,vm ) ),TP_fast_assign ( + __entry->dev = vm->dev->primary->index; __entry->vm = vm; ), -TP_printk ("dev=%d, vm=%p" , __entry->vm->dev->primary->index, __entry->vm) +TP_printk ("dev=%d, vm=%p" , __entry->dev, __entry->vm) ); TRACE_EVENT(i915_gem_ring_sync_to,
drivers/gpu/drm/i915/intel_display.c +16 -0
@@ -10771,6 +10771,17 @@ static void quirk_invert_brightness(struct drm_device *dev)DRM_INFO ("applying inverted panel brightness quirk\n" ); } +/* +* Some machines (Dell XPS13) suffer broken backlight controls if +* BLM_PCH_PWM_ENABLE is set. +*/ +static void quirk_no_pcm_pwm_enable (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; + dev_priv->quirks |=QUIRK_NO_PCH_PWM_ENABLE ; +DRM_INFO ("applying no-PCH_PWM_ENABLE quirk\n" ); +} +struct intel_quirk {int device;int subsystem_vendor;
@@ -10839,6 +10850,11 @@ static struct intel_quirk intel_quirks[] = {/* Acer Aspire 4736Z */ { 0x2a42, 0x1025, 0x0260, quirk_invert_brightness }, + +/* Dell XPS13 HD Sandy Bridge */ + { 0x0116, 0x1028, 0x052e, quirk_no_pcm_pwm_enable }, +/* Dell XPS13 HD and XPS13 FHD Ivy Bridge */ + { 0x0166, 0x1028, 0x058b, quirk_no_pcm_pwm_enable }, };static void intel_init_quirks (struct drm_device *dev)
drivers/gpu/drm/i915/intel_panel.c +4 -0
@@ -671,6 +671,10 @@ static void pch_enable_backlight(struct intel_connector *connector) pch_ctl2 = panel->backlight.max <<16 ;I915_WRITE (BLC_PWM_PCH_CTL2 , pch_ctl2); +/* XXX: transitional */ +if (dev_priv->quirks &QUIRK_NO_PCH_PWM_ENABLE ) +return ; + pch_ctl1 =0 ;if (panel->backlight.active_low_pwm) pch_ctl1 |=BLM_PCH_POLARITY ;
drivers/gpu/drm/i915/intel_tv.c +7 -2
@@ -1536,9 +1536,14 @@ static int tv_is_present_in_vbt(struct drm_device *dev)/* * If the device type is not TV, continue. */ -if (p_child->old.device_type !=DEVICE_TYPE_INT_TV && - p_child->old.device_type !=DEVICE_TYPE_TV ) +switch (p_child->old.device_type) { +case DEVICE_TYPE_INT_TV : +case DEVICE_TYPE_TV : +case DEVICE_TYPE_TV_SVIDEO_COMPOSITE : +break ; +default :continue ; + }/* Only when the addin_offset is non-zero, it is regarded * as present. */
drivers/gpu/drm/qxl/qxl_ttm.c +1 -0
@@ -433,6 +433,7 @@ static int qxl_sync_obj_flush(void *sync_obj)static void qxl_sync_obj_unref (void **sync_obj) { + *sync_obj =NULL ; }static void *qxl_sync_obj_ref (void *sync_obj)
drivers/gpu/drm/radeon/cik.c +3 -3
@@ -1095,7 +1095,7 @@ static const u32 spectre_golden_registers[] =0x8a14 ,0xf000003f ,0x00000007 ,0x8b24 ,0xffffffff ,0x00ffffff ,0x28350 ,0x3f3f3fff ,0x00000082 , -0x28355 ,0x0000003f ,0x00000000 , +0x28354 ,0x0000003f ,0x00000000 ,0x3e78 ,0x00000001 ,0x00000002 ,0x913c ,0xffff03df ,0x00000004 , 0xc768, 0x00000008, 0x00000008,
@@ -6521,8 +6521,8 @@ void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer) buffer[count++] =cpu_to_le32 (0x00000000 );break ;case CHIP_HAWAII : - buffer[count++] =0x3a00161a ; - buffer[count++] =0x0000002e ; + buffer[count++] =cpu_to_le32 (0x3a00161a ); + buffer[count++] =cpu_to_le32 (0x0000002e );break ;default : buffer[count++] =cpu_to_le32 (0x00000000 );
drivers/gpu/drm/radeon/radeon_display.c +1 -0
@@ -792,6 +792,7 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)if (radeon_connector->edid) {drm_mode_connector_update_edid_property (&radeon_connector->base, radeon_connector->edid); ret =drm_add_edid_modes (&radeon_connector->base, radeon_connector->edid); +drm_edid_to_eld (&radeon_connector->base, radeon_connector->edid);return ret; }drm_mode_connector_update_edid_property (&radeon_connector->base,NULL );
drivers/gpu/drm/radeon/radeon_ring.c +1 -0
@@ -257,6 +257,7 @@ int radeon_ib_ring_tests(struct radeon_device *rdev) r =radeon_ib_test (rdev, i, ring);if (r) { ring->ready = false; + rdev->needs_reset = false;if (i ==RADEON_RING_TYPE_GFX_INDEX ) {/* oh, oh, that's really bad */
drivers/gpu/drm/vmwgfx/vmwgfx_context.c +1 -1
@@ -117,10 +117,10 @@ static void vmw_hw_context_destroy(struct vmw_resource *res) (void )vmw_context_binding_state_kill (&container_of(res, struct vmw_user_context, res)->cbs); (void )vmw_gb_context_destroy (res); +mutex_unlock (&dev_priv->binding_mutex);if (dev_priv->pinned_bo !=NULL && !dev_priv->query_cid_valid)__vmw_execbuf_release_pinned_bo (dev_priv,NULL ); -mutex_unlock (&dev_priv->binding_mutex);mutex_unlock (&dev_priv->cmdbuf_mutex);return ; }
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +22 -0
@@ -1214,14 +1214,36 @@ static int vmw_cmd_dma(struct vmw_private *dev_priv,SVGA3dCmdSurfaceDMA dma; } *cmd;int ret; +SVGA3dCmdSurfaceDMASuffix *suffix; +uint32_t bo_size; cmd = container_of(header, struct vmw_dma_cmd, header); + suffix = (SVGA3dCmdSurfaceDMASuffix *)((unsigned long ) &cmd->dma + + header->size -sizeof (*suffix)); + +/* Make sure device and verifier stays in sync. */ +if (unlikely (suffix->suffixSize !=sizeof (*suffix))) { +DRM_ERROR ("Invalid DMA suffix size.\n" ); +return -EINVAL ; + } + ret =vmw_translate_guest_ptr (dev_priv, sw_context, &cmd->dma.guest.ptr, &vmw_bo);if (unlikely (ret !=0 ))return ret; +/* Make sure DMA doesn't cross BO boundaries. */ + bo_size = vmw_bo->base.num_pages *PAGE_SIZE ; +if (unlikely (cmd->dma.guest.ptr.offset > bo_size)) { +DRM_ERROR ("Invalid DMA offset.\n" ); +return -EINVAL ; + } + + bo_size -= cmd->dma.guest.ptr.offset; +if (unlikely (suffix->maximumOffset > bo_size)) + suffix->maximumOffset = bo_size; + ret =vmw_cmd_res_check (dev_priv, sw_context, vmw_res_surface, user_surface_converter, &cmd->dma.host.sid,NULL );
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +4 -1
@@ -147,7 +147,7 @@ static int vmw_fb_check_var(struct fb_var_screeninfo *var, }if (!vmw_kms_validate_mode_vram (vmw_priv, - info->fix.line_length, + var->xres * var->bits_per_pixel/8 , var->yoffset + var->yres)) {DRM_ERROR ("Requested geom can not fit in framebuffer\n" );return -EINVAL ;
@@ -162,6 +162,8 @@ static int vmw_fb_set_par(struct fb_info *info)struct vmw_private *vmw_priv = par->vmw_priv;int ret; + info->fix.line_length = info->var.xres * info->var.bits_per_pixel/8 ; + ret =vmw_kms_write_svga (vmw_priv, info->var.xres, info->var.yres, info->fix.line_length, par->bpp, par->depth);
@@ -177,6 +179,7 @@ static int vmw_fb_set_par(struct fb_info *info)vmw_write (vmw_priv,SVGA_REG_DISPLAY_POSITION_Y , info->var.yoffset);vmw_write (vmw_priv,SVGA_REG_DISPLAY_WIDTH , info->var.xres);vmw_write (vmw_priv,SVGA_REG_DISPLAY_HEIGHT , info->var.yres); +vmw_write (vmw_priv,SVGA_REG_BYTES_PER_LINE , info->fix.line_length);vmw_write (vmw_priv,SVGA_REG_DISPLAY_ID ,SVGA_ID_INVALID ); }
drivers/hid/hid-core.c +3 -2
@@ -718,6 +718,9 @@ static int hid_scan_main(struct hid_parser *parser, struct hid_item *item)case HID_MAIN_ITEM_TAG_END_COLLECTION :break ;case HID_MAIN_ITEM_TAG_INPUT : +/* ignore constant inputs, they will be ignored by hid-input */ +if (data &HID_MAIN_ITEM_CONSTANT ) +break ;for (i =0 ; i < parser->local.usage_index; i++)hid_scan_input_usage (parser, parser->local.usage[i]);break ;
@@ -1780,8 +1783,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
drivers/hid/hid-ids.h +1 -2
@@ -624,8 +624,6 @@#define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K 0x0730#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c -#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 -#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9#define USB_VENDOR_ID_MOJO 0x8282#define USB_DEVICE_ID_RETRO_ADAPTER 0x3201
@@ -830,6 +828,7 @@#define USB_DEVICE_ID_SYNAPTICS_LTS2 0x1d10#define USB_DEVICE_ID_SYNAPTICS_HD 0x0ac3#define USB_DEVICE_ID_SYNAPTICS_QUAD_HD 0x1ac3 +#define USB_DEVICE_ID_SYNAPTICS_TP_V103 0x5710#define USB_VENDOR_ID_THINGM 0x27b8#define USB_DEVICE_ID_BLINK1 0x01ed
drivers/hid/hid-microsoft.c +0 -4
@@ -208,10 +208,6 @@ static const struct hid_device_id ms_devices[] = { .driver_data = MS_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500), .driver_data = MS_DUPLICATE_USAGES }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), - .driver_data = 0 }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), - .driver_data = 0 }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), .driver_data = MS_PRESENTER },
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -119,6 +119,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS2, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_HD, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_QUAD_HD, HID_QUIRK_NO_INIT_REPORTS }, + { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_TP_V103, HID_QUIRK_NO_INIT_REPORTS }, { 0, 0 } };
drivers/md/raid1.c +13 -4
@@ -97,6 +97,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)struct pool_info *pi = data;struct r1bio *r1_bio;struct bio *bio; +int need_pages;int i, j; r1_bio =r1bio_pool_alloc (gfp_flags, pi);
@@ -119,15 +120,15 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)* RESYNC_PAGES for each bio. */ if (test_bit (MD_RECOVERY_REQUESTED , &pi->mddev->recovery)) - j = pi->raid_disks; + need_pages = pi->raid_disks;else - j =1 ; -while (j--) { + need_pages =1 ; +for (j =0 ; j < need_pages; j++) { bio = r1_bio->bios[j]; bio->bi_vcnt =RESYNC_PAGES ;if (bio_alloc_pages (bio, gfp_flags)) - goto out_free_bio; + goto out_free_pages; }/* If not user-requests, copy the page pointers to all bios */ if (!test_bit (MD_RECOVERY_REQUESTED , &pi->mddev->recovery)) {
@@ -141,6 +142,14 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)return r1_bio; +out_free_pages: +while (--j >=0 ) { +struct bio_vec *bv; + +bio_for_each_segment_all (bv, r1_bio->bios[j], i) +__free_page (bv->bv_page); + } + out_free_bio:while (++j < pi->raid_disks)bio_put (r1_bio->bios[j]);
drivers/net/bonding/bond_main.c +1 -0
@@ -4536,6 +4536,7 @@ static int __init bonding_init(void) out:return res; err: +bond_destroy_debugfs ();bond_netlink_fini (); err_link:unregister_pernet_subsys (&bond_net_ops);
drivers/net/bonding/bond_options.c +1 -0
@@ -70,6 +70,7 @@ static struct bond_opt_value bond_fail_over_mac_tbl[] = {static struct bond_opt_value bond_intmax_tbl[] = { {"off" ,0 ,BOND_VALFLAG_DEFAULT }, {"maxval" ,INT_MAX ,BOND_VALFLAG_MAX }, + {NULL ,-1 ,0 } };static struct bond_opt_value bond_lacp_rate_tbl[] = {
drivers/net/ethernet/broadcom/tg3.c +3 -1
@@ -12294,7 +12294,9 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *eif (tg3_flag (tp,MAX_RXPEND_64 ) && tp->rx_pending >63 ) tp->rx_pending =63 ; - tp->rx_jumbo_pending = ering->rx_jumbo_pending; + +if (tg3_flag (tp,JUMBO_RING_ENABLE )) + tp->rx_jumbo_pending = ering->rx_jumbo_pending;for (i =0 ; i < tp->irq_max; i++) tp->napi[i].tx_pending = ering->tx_pending;
drivers/net/ethernet/mellanox/mlx4/en_cq.c +0 -1
@@ -66,7 +66,6 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv, cq->ring = ring; cq->is_tx = mode; -spin_lock_init (&cq->lock);/* Allocate HW buffers on provided NUMA node. * dev->numa_node is used in mtt range allocation flow.
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -5
@@ -1315,15 +1315,11 @@ static void mlx4_en_netpoll(struct net_device *dev) {struct mlx4_en_priv *priv =netdev_priv (dev);struct mlx4_en_cq *cq; -unsigned long flags;int i;for (i =0 ; i < priv->rx_ring_num; i++) { cq = priv->rx_cq[i]; -spin_lock_irqsave (&cq->lock, flags); -napi_synchronize (&cq->napi); -mlx4_en_process_rx_cq (dev, cq,0 ); -spin_unlock_irqrestore (&cq->lock, flags); +napi_schedule (&cq->napi); } }#endif
drivers/net/ethernet/mellanox/mlx4/main.c +2 -1
@@ -2399,7 +2399,8 @@ slave_start:* No return code for this call, just warn the user in case of PCI * express device capabilities are under-satisfied by the bus. */ -mlx4_check_pcie_caps (dev); +if (!mlx4_is_slave (dev)) +mlx4_check_pcie_caps (dev);/* In master functions, the communication channel must be initialized * after obtaining its address from fw */
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +0 -1
@@ -309,7 +309,6 @@ struct mlx4_en_cq {struct mlx4_cq mcq;struct mlx4_hwq_resources wqres;int ring; -spinlock_t lock;struct net_device *dev;struct napi_struct napi;int size;
drivers/net/ethernet/sfc/nic.c +8 -6
@@ -156,13 +156,15 @@ void efx_nic_fini_interrupt(struct efx_nic *efx) efx->net_dev->rx_cpu_rmap =NULL ;#endif -/* Disable MSI/MSI-X interrupts */ -efx_for_each_channel (channel, efx) -free_irq (channel->irq, &efx->msi_context[channel->channel]); - -/* Disable legacy interrupt */ -if (efx->legacy_irq) +if (EFX_INT_MODE_USE_MSI (efx)) { +/* Disable MSI/MSI-X interrupts */ +efx_for_each_channel (channel, efx) +free_irq (channel->irq, + &efx->msi_context[channel->channel]); + }else { +/* Disable legacy interrupt */ free_irq (efx->legacy_irq, efx); + } }/* Register dump */
drivers/net/macvlan.c +14 -7
@@ -263,11 +263,9 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)const struct macvlan_dev *vlan =netdev_priv (dev);const struct macvlan_port *port = vlan->port;const struct macvlan_dev *dest; -__u8 ip_summed = skb->ip_summed;if (vlan->mode ==MACVLAN_MODE_BRIDGE ) {const struct ethhdr *eth = (void *)skb->data; - skb->ip_summed =CHECKSUM_UNNECESSARY ;/* send to other bridge ports directly */ if (is_multicast_ether_addr (eth->h_dest)) {
@@ -285,7 +283,6 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) } xmit_world: - skb->ip_summed = ip_summed; skb->dev = vlan->lowerdev;return dev_queue_xmit (skb); }
@@ -461,8 +458,10 @@ static void macvlan_change_rx_flags(struct net_device *dev, int change)struct macvlan_dev *vlan =netdev_priv (dev);struct net_device *lowerdev = vlan->lowerdev; -if (change &IFF_ALLMULTI ) -dev_set_allmulti (lowerdev, dev->flags &IFF_ALLMULTI ?1 :-1 ); +if (dev->flags &IFF_UP ) { +if (change &IFF_ALLMULTI ) +dev_set_allmulti (lowerdev, dev->flags &IFF_ALLMULTI ?1 :-1 ); + } }static void macvlan_set_mac_lists (struct net_device *dev)
@@ -518,6 +517,11 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;#define MACVLAN_STATE_MASK \ ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT)) +static int macvlan_get_nest_level (struct net_device *dev) +{ +return ((struct macvlan_dev *)netdev_priv (dev))->nest_level; +} +static void macvlan_set_lockdep_class_one (struct net_device *dev,struct netdev_queue *txq,void *_unused)
@@ -528,8 +532,9 @@ static void macvlan_set_lockdep_class_one(struct net_device *dev,static void macvlan_set_lockdep_class (struct net_device *dev) { -lockdep_set_class (&dev->addr_list_lock, - &macvlan_netdev_addr_lock_key); +lockdep_set_class_and_subclass (&dev->addr_list_lock, + &macvlan_netdev_addr_lock_key, +macvlan_get_nest_level (dev));netdev_for_each_tx_queue (dev, macvlan_set_lockdep_class_one,NULL ); }
@@ -731,6 +736,7 @@ static const struct net_device_ops macvlan_netdev_ops = { .ndo_fdb_add = macvlan_fdb_add, .ndo_fdb_del = macvlan_fdb_del, .ndo_fdb_dump = ndo_dflt_fdb_dump, + .ndo_get_lock_subclass = macvlan_get_nest_level, };void macvlan_common_setup (struct net_device *dev)
@@ -859,6 +865,7 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, vlan->dev = dev; vlan->port = port; vlan->set_features =MACVLAN_FEATURES ; + vlan->nest_level =dev_get_nest_level (lowerdev, netif_is_macvlan) +1 ; vlan->mode =MACVLAN_MODE_VEPA ;if (data && data[IFLA_MACVLAN_MODE ])
drivers/net/macvtap.c +9 -0
@@ -322,6 +322,15 @@ static rx_handler_result_t macvtap_handle_frame(struct sk_buff **pskb) segs = nskb; } }else { +/* If we receive a partial checksum and the tap side +* doesn't support checksum offload, compute the checksum. +* Note: it doesn't matter which checksum feature to +* check, we either support them all or none. +*/ +if (skb->ip_summed ==CHECKSUM_PARTIAL && + !(features &NETIF_F_ALL_CSUM ) && +skb_checksum_help (skb)) + goto drop;skb_queue_tail (&q->sk.sk_receive_queue, skb); }
drivers/net/phy/phy_device.c +2 -2
@@ -613,8 +613,8 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, err =phy_init_hw (phydev);if (err)phy_detach (phydev); - -phy_resume (phydev); +else +phy_resume (phydev);return err; }
drivers/net/slip/slip.c +3 -3
@@ -429,13 +429,13 @@ static void slip_write_wakeup(struct tty_struct *tty)if (!sl || sl->magic !=SLIP_MAGIC || !netif_running (sl->dev))return ; -spin_lock (&sl->lock); +spin_lock_bh (&sl->lock);if (sl->xleft <=0 ) {/* Now serial buffer is almost free & we can start * transmission of another packet */ sl->dev->stats.tx_packets++;clear_bit (TTY_DO_WRITE_WAKEUP , &tty->flags); -spin_unlock (&sl->lock); +spin_unlock_bh (&sl->lock);sl_unlock (sl);return ; }
@@ -443,7 +443,7 @@ static void slip_write_wakeup(struct tty_struct *tty) actual = tty->ops->write (tty, sl->xhead, sl->xleft); sl->xleft -= actual; sl->xhead += actual; -spin_unlock (&sl->lock); +spin_unlock_bh (&sl->lock); }static void sl_tx_timeout (struct net_device *dev)
drivers/net/usb/cdc_mbim.c +41 -16
108 lines not on this page · raw message
drivers/net/usb/cdc_ncm.c +1 -1
@@ -768,7 +768,7 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) skb_out->len > CDC_NCM_MIN_TX_PKT)memset (skb_put (skb_out, ctx->tx_max - skb_out->len),0 , ctx->tx_max - skb_out->len); - else if ((skb_out->len % dev->maxpacket) == 0) + else if (skb_out->len < ctx->tx_max && (skb_out->len % dev->maxpacket) == 0) *skb_put(skb_out, 1) = 0; /* force short packet *//* set final frame length */
drivers/net/usb/qmi_wwan.c +28 -0
@@ -662,6 +662,22 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x05c6, 0x920d, 5)}, {QMI_FIXED_INTF(0x12d1, 0x140c, 1)}, /* Huawei E173 */ {QMI_FIXED_INTF(0x12d1, 0x14ac, 1)}, /* Huawei E1820 */ + {QMI_FIXED_INTF(0x16d8, 0x6003, 0)}, /* CMOTech 6003 */ + {QMI_FIXED_INTF(0x16d8, 0x6007, 0)}, /* CMOTech CHE-628S */ + {QMI_FIXED_INTF(0x16d8, 0x6008, 0)}, /* CMOTech CMU-301 */ + {QMI_FIXED_INTF(0x16d8, 0x6280, 0)}, /* CMOTech CHU-628 */ + {QMI_FIXED_INTF(0x16d8, 0x7001, 0)}, /* CMOTech CHU-720S */ + {QMI_FIXED_INTF(0x16d8, 0x7002, 0)}, /* CMOTech 7002 */ + {QMI_FIXED_INTF(0x16d8, 0x7003, 4)}, /* CMOTech CHU-629K */ + {QMI_FIXED_INTF(0x16d8, 0x7004, 3)}, /* CMOTech 7004 */ + {QMI_FIXED_INTF(0x16d8, 0x7006, 5)}, /* CMOTech CGU-629 */ + {QMI_FIXED_INTF(0x16d8, 0x700a, 4)}, /* CMOTech CHU-629S */ + {QMI_FIXED_INTF(0x16d8, 0x7211, 0)}, /* CMOTech CHU-720I */ + {QMI_FIXED_INTF(0x16d8, 0x7212, 0)}, /* CMOTech 7212 */ + {QMI_FIXED_INTF(0x16d8, 0x7213, 0)}, /* CMOTech 7213 */ + {QMI_FIXED_INTF(0x16d8, 0x7251, 1)}, /* CMOTech 7251 */ + {QMI_FIXED_INTF(0x16d8, 0x7252, 1)}, /* CMOTech 7252 */ + {QMI_FIXED_INTF(0x16d8, 0x7253, 1)}, /* CMOTech 7253 */ {QMI_FIXED_INTF(0x19d2, 0x0002, 1)}, {QMI_FIXED_INTF(0x19d2, 0x0012, 1)}, {QMI_FIXED_INTF(0x19d2, 0x0017, 3)},
@@ -723,16 +739,28 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x114f, 0x68a2, 8)}, /* Sierra Wireless MC7750 */ {QMI_FIXED_INTF(0x1199, 0x68a2, 8)}, /* Sierra Wireless MC7710 in QMI mode */ {QMI_FIXED_INTF(0x1199, 0x68a2, 19)}, /* Sierra Wireless MC7710 in QMI mode */ + {QMI_FIXED_INTF(0x1199, 0x68c0, 8)}, /* Sierra Wireless MC73xx */ + {QMI_FIXED_INTF(0x1199, 0x68c0, 10)}, /* Sierra Wireless MC73xx */ + {QMI_FIXED_INTF(0x1199, 0x68c0, 11)}, /* Sierra Wireless MC73xx */ {QMI_FIXED_INTF(0x1199, 0x901c, 8)}, /* Sierra Wireless EM7700 */ + {QMI_FIXED_INTF(0x1199, 0x901f, 8)}, /* Sierra Wireless EM7355 */ + {QMI_FIXED_INTF(0x1199, 0x9041, 8)}, /* Sierra Wireless MC7305/MC7355 */ {QMI_FIXED_INTF(0x1199, 0x9051, 8)}, /* Netgear AirCard 340U */ {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */ + {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)}, /* Alcatel L800MA */ {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */ {QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */ {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */ {QMI_FIXED_INTF(0x0b3c, 0xc005, 6)}, /* Olivetti Olicard 200 */ + {QMI_FIXED_INTF(0x0b3c, 0xc00b, 4)}, /* Olivetti Olicard 500 */ {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)}, /* Cinterion PLxx */ {QMI_FIXED_INTF(0x1e2d, 0x0053, 4)}, /* Cinterion PHxx,PXxx */ + {QMI_FIXED_INTF(0x413c, 0x81a2, 8)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ + {QMI_FIXED_INTF(0x413c, 0x81a3, 8)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ + {QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */ + {QMI_FIXED_INTF(0x413c, 0x81a8, 8)}, /* Dell Wireless 5808 Gobi(TM) 4G LTE Mobile Broadband Card */ + {QMI_FIXED_INTF(0x413c, 0x81a9, 8)}, /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card *//* 4. Gobi 1000 devices */ {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
drivers/net/wireless/ti/wl18xx/event.h +20 -0
@@ -68,6 +68,26 @@ struct wl18xx_event_mailbox {/* bitmap of inactive stations (by HLID) */ __le32 inactive_sta_bitmap; + +/* rx BA win size indicated by RX_BA_WIN_SIZE_CHANGE_EVENT_ID */ +u8 rx_ba_role_id; +u8 rx_ba_link_id; +u8 rx_ba_win_size; +u8 padding; + +/* smart config */ +u8 sc_ssid_len; +u8 sc_pwd_len; +u8 sc_token_len; +u8 padding1; +u8 sc_ssid[32 ]; +u8 sc_pwd[32 ]; +u8 sc_token[32 ]; + +/* smart config sync channel */ +u8 sc_sync_channel; +u8 sc_sync_band; +u8 padding2[2 ]; } __packed; int wl18xx_wait_for_event(struct wl1271 *wl, enum wlcore_wait_event event,
drivers/scsi/megaraid/megaraid_mm.c +2 -0
@@ -486,6 +486,8 @@ mimd_to_kioc(mimd_t __user *umimd, mraid_mmadp_t *adp, uioc_t *kioc) pthru32->dataxferaddr = kioc->buf_paddr;if (kioc->data_dir &UIOC_WR ) { +if (pthru32->dataxferlen > kioc->xferlen) +return -EINVAL ;if (copy_from_user (kioc->buf_vaddr, kioc->user_data, pthru32->dataxferlen)) {return (-EFAULT );
drivers/scsi/scsi_scan.c +71 -41
168 lines not on this page · raw message
drivers/scsi/scsi_sysfs.c +14 -6
@@ -383,17 +383,14 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work) {struct scsi_device *sdev;struct device *parent; -struct scsi_target *starget;struct list_head *this, *tmp;unsigned long flags; sdev = container_of(work, struct scsi_device, ew.work); parent = sdev->sdev_gendev.parent; - starget =to_scsi_target (parent);spin_lock_irqsave (sdev->host->host_lock, flags); - starget->reap_ref++;list_del (&sdev->siblings);list_del (&sdev->same_target_siblings);list_del (&sdev->starved_entry);
@@ -413,8 +410,6 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)/* NULL queue means the device can't be used */ sdev->request_queue =NULL ; -scsi_target_reap (scsi_target (sdev)); -kfree (sdev->inquiry);kfree (sdev);
@@ -1071,6 +1066,13 @@ void __scsi_remove_device(struct scsi_device *sdev) sdev->host->hostt->slave_destroy (sdev);transport_destroy_device (dev); +/* +* Paired with the kref_get() in scsi_sysfs_initialize(). We have +* remoed sysfs visibility from the device, so make the target +* invisible if this was the last device underneath it. +*/ +scsi_target_reap (scsi_target (sdev)); +put_device (dev); }
@@ -1133,7 +1135,7 @@ void scsi_remove_target(struct device *dev)continue ;if (starget->dev.parent == dev || &starget->dev == dev) {/* assuming new targets arrive at the end */ - starget->reap_ref++; +kref_get (&starget->reap_ref);spin_unlock_irqrestore (shost->host_lock, flags);if (last)scsi_target_reap (last);
@@ -1217,6 +1219,12 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)list_add_tail (&sdev->same_target_siblings, &starget->devices);list_add_tail (&sdev->siblings, &shost->__devices);spin_unlock_irqrestore (shost->host_lock, flags); +/* +* device can now only be removed via __scsi_remove_device() so hold +* the target. Target will be held in CREATED state until something +* beneath it becomes visible (in which case it moves to RUNNING) +*/ +kref_get (&starget->reap_ref); }int scsi_is_sdev_device (const struct device *dev)
drivers/tty/serial/omap-serial.c +17 -12
@@ -225,14 +225,19 @@ static inline void serial_omap_enable_wakeirq(struct uart_omap_port *up,if (enable)enable_irq (up->wakeirq);else -disable_irq (up->wakeirq); +disable_irq_nosync (up->wakeirq); }static void serial_omap_enable_wakeup (struct uart_omap_port *up,bool enable) {struct omap_uart_port_info *pdata =dev_get_platdata (up->dev); +if (enable == up->wakeups_enabled) +return ; +serial_omap_enable_wakeirq (up, enable); + up->wakeups_enabled = enable; +if (!pdata || !pdata->enable_wakeup)return ;
@@ -1488,6 +1493,11 @@ static int serial_omap_suspend(struct device *dev)uart_suspend_port (&serial_omap_reg, &up->port);flush_work (&up->qos_work); +if (device_may_wakeup (dev)) +serial_omap_enable_wakeup (up, true); +else +serial_omap_enable_wakeup (up, false); +return 0 ; }
@@ -1495,6 +1505,9 @@ static int serial_omap_resume(struct device *dev) {struct uart_omap_port *up =dev_get_drvdata (dev); +if (device_may_wakeup (dev)) +serial_omap_enable_wakeup (up, false); +uart_resume_port (&serial_omap_reg, &up->port);return 0 ;
@@ -1870,17 +1883,7 @@ static int serial_omap_runtime_suspend(struct device *dev) up->context_loss_cnt =serial_omap_get_context_loss_count (up); -if (device_may_wakeup (dev)) { -if (!up->wakeups_enabled) { -serial_omap_enable_wakeup (up, true); - up->wakeups_enabled = true; - } - }else { -if (up->wakeups_enabled) { -serial_omap_enable_wakeup (up, false); - up->wakeups_enabled = false; - } - } +serial_omap_enable_wakeup (up, true); up->latency =PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE ;schedule_work (&up->qos_work);
@@ -1894,6 +1897,8 @@ static int serial_omap_runtime_resume(struct device *dev)int loss_cnt =serial_omap_get_context_loss_count (up); +serial_omap_enable_wakeup (up, false); +if (loss_cnt <0 ) {dev_dbg (dev,"serial_omap_get_context_loss_count failed : %d\n" , loss_cnt);
drivers/usb/class/cdc-acm.c +21 -7
@@ -1652,13 +1652,27 @@ static const struct usb_device_id acm_ids[] = { },/* Motorola H24 HSPA module: */ { USB_DEVICE(0x22b8, 0x2d91) }, /* modem */ - { USB_DEVICE(0x22b8, 0x2d92) }, /* modem + diagnostics */ - { USB_DEVICE(0x22b8, 0x2d93) }, /* modem + AT port */ - { USB_DEVICE(0x22b8, 0x2d95) }, /* modem + AT port + diagnostics */ - { USB_DEVICE(0x22b8, 0x2d96) }, /* modem + NMEA */ - { USB_DEVICE(0x22b8, 0x2d97) }, /* modem + diagnostics + NMEA */ - { USB_DEVICE(0x22b8, 0x2d99) }, /* modem + AT port + NMEA */ - { USB_DEVICE(0x22b8, 0x2d9a) }, /* modem + AT port + diagnostics + NMEA */ + { USB_DEVICE(0x22b8, 0x2d92), /* modem + diagnostics */ + .driver_info =NO_UNION_NORMAL ,/* handle only modem interface */ + }, + { USB_DEVICE(0x22b8, 0x2d93), /* modem + AT port */ + .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ + }, + { USB_DEVICE(0x22b8, 0x2d95), /* modem + AT port + diagnostics */ + .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ + }, + { USB_DEVICE(0x22b8, 0x2d96), /* modem + NMEA */ + .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ + }, + { USB_DEVICE(0x22b8, 0x2d97), /* modem + diagnostics + NMEA */ + .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ + }, + { USB_DEVICE(0x22b8, 0x2d99), /* modem + AT port + NMEA */ + .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ + }, + { USB_DEVICE(0x22b8, 0x2d9a), /* modem + AT port + diagnostics + NMEA */ + .driver_info = NO_UNION_NORMAL, /* handle only modem interface */ + }, { USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */ .driver_info = NO_UNION_NORMAL, /* union descriptor misplaced on
drivers/usb/serial/cp210x.c +1 -0
@@ -104,6 +104,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */ { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */ + { USB_DEVICE(0x10C4, 0x8281) }, /* Nanotec Plug & Drive */ { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */ { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */ { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
drivers/usb/serial/ftdi_sio.c +33 -0
@@ -909,6 +909,39 @@ static const struct usb_device_id id_table_combined[] = { { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },/* Cressi Devices */ { USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) }, +/* Brainboxes Devices */ + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_001_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_012_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_4_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_5_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_357_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_1_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_2_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_606_3_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_1_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_701_2_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_1_PID) }, + { 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) }, { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +37 -0
@@ -1326,3 +1326,40 @@* Manufacturer: Cressi */ #define FTDI_CRESSI_PID 0x87d0 + +/* +* Brainboxes devices +*/ +#define BRAINBOXES_VID 0x05d1 +#define BRAINBOXES_VX_001_PID 0x1001/* VX-001 ExpressCard 1 Port RS232 */ +#define BRAINBOXES_VX_012_PID 0x1002/* VX-012 ExpressCard 2 Port RS232 */ +#define BRAINBOXES_VX_023_PID 0x1003/* VX-023 ExpressCard 1 Port RS422/485 */ +#define BRAINBOXES_VX_034_PID 0x1004/* VX-034 ExpressCard 2 Port RS422/485 */ +#define BRAINBOXES_US_101_PID 0x1011/* US-101 1xRS232 */ +#define BRAINBOXES_US_324_PID 0x1013/* US-324 1xRS422/485 1Mbaud */ +#define BRAINBOXES_US_606_1_PID 0x2001/* US-606 6 Port RS232 Serial Port 1 and 2 */ +#define BRAINBOXES_US_606_2_PID 0x2002/* US-606 6 Port RS232 Serial Port 3 and 4 */ +#define BRAINBOXES_US_606_3_PID 0x2003/* US-606 6 Port RS232 Serial Port 4 and 6 */ +#define BRAINBOXES_US_701_1_PID 0x2011/* US-701 4xRS232 1Mbaud Port 1 and 2 */ +#define BRAINBOXES_US_701_2_PID 0x2012/* US-701 4xRS422 1Mbaud Port 3 and 4 */ +#define BRAINBOXES_US_279_1_PID 0x2021/* US-279 8xRS422 1Mbaud Port 1 and 2 */ +#define BRAINBOXES_US_279_2_PID 0x2022/* US-279 8xRS422 1Mbaud Port 3 and 4 */ +#define BRAINBOXES_US_279_3_PID 0x2023/* US-279 8xRS422 1Mbaud Port 5 and 6 */ +#define BRAINBOXES_US_279_4_PID 0x2024/* US-279 8xRS422 1Mbaud Port 7 and 8 */ +#define BRAINBOXES_US_346_1_PID 0x3011/* US-346 4xRS422/485 1Mbaud Port 1 and 2 */ +#define BRAINBOXES_US_346_2_PID 0x3012/* US-346 4xRS422/485 1Mbaud Port 3 and 4 */ +#define BRAINBOXES_US_257_PID 0x5001/* US-257 2xRS232 1Mbaud */ +#define BRAINBOXES_US_313_PID 0x6001/* US-313 2xRS422/485 1Mbaud */ +#define BRAINBOXES_US_357_PID 0x7001/* US_357 1xRS232/422/485 */ +#define BRAINBOXES_US_842_1_PID 0x8001/* US-842 8xRS422/485 1Mbaud Port 1 and 2 */ +#define BRAINBOXES_US_842_2_PID 0x8002/* US-842 8xRS422/485 1Mbaud Port 3 and 4 */ +#define BRAINBOXES_US_842_3_PID 0x8003/* US-842 8xRS422/485 1Mbaud Port 5 and 6 */ +#define BRAINBOXES_US_842_4_PID 0x8004/* US-842 8xRS422/485 1Mbaud Port 7 and 8 */ +#define BRAINBOXES_US_160_1_PID 0x9001/* US-160 16xRS232 1Mbaud Port 1 and 2 */ +#define BRAINBOXES_US_160_2_PID 0x9002/* US-160 16xRS232 1Mbaud Port 3 and 4 */ +#define BRAINBOXES_US_160_3_PID 0x9003/* US-160 16xRS232 1Mbaud Port 5 and 6 */ +#define BRAINBOXES_US_160_4_PID 0x9004/* US-160 16xRS232 1Mbaud Port 7 and 8 */ +#define BRAINBOXES_US_160_5_PID 0x9005/* US-160 16xRS232 1Mbaud Port 9 and 10 */ +#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 */
drivers/usb/serial/io_ti.c +33 -17
128 lines not on this page · raw message
drivers/usb/serial/option.c +79 -4
136 lines not on this page · raw message
drivers/usb/serial/qcserial.c +9 -0
@@ -136,9 +136,18 @@ static const struct usb_device_id id_table[] = { {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x68a2, 0)}, /* Sierra Wireless MC7710 Device Management */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x68a2, 2)}, /* Sierra Wireless MC7710 NMEA */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x68a2, 3)}, /* Sierra Wireless MC7710 Modem */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x68c0, 0)}, /* Sierra Wireless MC73xx Device Management */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x68c0, 2)}, /* Sierra Wireless MC73xx NMEA */ + {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x68c0, 3)}, /* Sierra Wireless MC73xx Modem */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 0)}, /* Sierra Wireless EM7700 Device Management */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 2)}, /* Sierra Wireless EM7700 NMEA */ {USB_DEVICE_INTERFACE_NUMBER(0x1199, 0x901c, 3)}, /* Sierra Wireless EM7700 Modem */ + {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, 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 */
drivers/usb/serial/sierra.c +0 -1
@@ -291,7 +291,6 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x0f3d, 0x68A3), /* Airprime/Sierra Wireless Direct IP modems */ .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist }, - { USB_DEVICE(0x413C, 0x08133) }, /* Dell Computer Corp. Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port */ { } };
drivers/usb/serial/usb-serial.c +3 -1
@@ -1348,10 +1348,12 @@ static int usb_serial_register(struct usb_serial_driver *driver)static void usb_serial_deregister (struct usb_serial_driver *device) {pr_info ("USB Serial deregistering driver %s\n" , device->description); +mutex_lock (&table_lock);list_del (&device->driver_list); -usb_serial_bus_deregister (device);mutex_unlock (&table_lock); + +usb_serial_bus_deregister (device); }/**
drivers/usb/serial/usb_wwan.c +3 -6
@@ -466,6 +466,9 @@ int usb_wwan_port_probe(struct usb_serial_port *port)int err;int i; +if (!port->bulk_in_size || !port->bulk_out_size) +return -ENODEV ; + portdata =kzalloc (sizeof (*portdata),GFP_KERNEL );if (!portdata)return -ENOMEM ;
@@ -473,9 +476,6 @@ int usb_wwan_port_probe(struct usb_serial_port *port)init_usb_anchor (&portdata->delayed);for (i =0 ; i <N_IN_URB ; i++) { -if (!port->bulk_in_size) -break ; - buffer = (u8 *)__get_free_page (GFP_KERNEL );if (!buffer) goto bail_out_error;
@@ -489,9 +489,6 @@ int usb_wwan_port_probe(struct usb_serial_port *port) }for (i =0 ; i <N_OUT_URB ; i++) { -if (!port->bulk_out_size) -break ; - buffer =kmalloc (OUT_BUFLEN ,GFP_KERNEL );if (!buffer) goto bail_out_error2;
drivers/xen/events/events_fifo.c +30 -11
101 lines not on this page · raw message
fs/cifs/cifsfs.c +13 -1
@@ -253,6 +253,11 @@ cifs_alloc_inode(struct super_block *sb)cifs_set_oplock_level (cifs_inode,0 ); cifs_inode->delete_pending = false; cifs_inode->invalid_mapping = false; +clear_bit (CIFS_INODE_PENDING_OPLOCK_BREAK , &cifs_inode->flags); +clear_bit (CIFS_INODE_PENDING_WRITERS , &cifs_inode->flags); +clear_bit (CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2 , &cifs_inode->flags); +spin_lock_init (&cifs_inode->writers_lock); + cifs_inode->writers =0 ; cifs_inode->vfs_inode.i_blkbits =14 ;/* 2**14 = CIFS_MAX_MSGSIZE */ cifs_inode->server_eof =0 ; cifs_inode->uniqueid =0 ;
@@ -731,19 +736,26 @@ static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos) {struct inode *inode =file_inode (iocb->ki_filp); +struct cifsInodeInfo *cinode =CIFS_I (inode);ssize_t written;int rc; + written =cifs_get_writer (cinode); +if (written) +return written; + written =generic_file_aio_write (iocb, iov, nr_segs, pos);if (CIFS_CACHE_WRITE (CIFS_I (inode))) -return written; + goto out; rc =filemap_fdatawrite (inode->i_mapping);if (rc)cifs_dbg (FYI ,"cifs_file_aio_write: %d rc on %p inode\n" , rc, inode); +out: +cifs_put_writer (cinode);return written; }
fs/cifs/cifsglob.h +8 -0
@@ -228,6 +228,8 @@ struct smb_version_operations {/* verify the message */ int (*check_message)(char *,unsigned int );bool (*is_oplock_break)(char *,struct TCP_Server_Info *); +void (*downgrade_oplock)(struct TCP_Server_Info *, +struct cifsInodeInfo *,bool );/* process transaction2 response */ bool (*check_trans2)(struct mid_q_entry *,struct TCP_Server_Info *,char *,int );
@@ -1113,6 +1115,12 @@ struct cifsInodeInfo {unsigned int epoch;/* used to track lease state changes */ bool delete_pending;/* DELETE_ON_CLOSE is set */ bool invalid_mapping;/* pagecache is invalid */ +unsigned long flags; +#define CIFS_INODE_PENDING_OPLOCK_BREAK (0)/* oplock break in progress */ +#define CIFS_INODE_PENDING_WRITERS (1)/* Writes in progress */ +#define CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2 (2)/* Downgrade oplock to L2 */ +spinlock_t writers_lock; +unsigned int writers;/* Number of writers on this inode */ unsigned long time;/* jiffies of last update of inode */ u64 server_eof;/* current file size on server -- protected by i_lock */ u64 uniqueid;/* server inode number */
fs/cifs/cifsproto.h +3 -0
@@ -127,6 +127,9 @@ extern u64 cifs_UnixTimeToNT(struct timespec);extern struct timespec cnvrtDosUnixTm (__le16 le_date,__le16 le_time,int offset);extern void cifs_set_oplock_level (struct cifsInodeInfo *cinode,__u32 oplock); +extern int cifs_get_writer (struct cifsInodeInfo *cinode); +extern void cifs_put_writer (struct cifsInodeInfo *cinode); +extern void cifs_done_oplock_break (struct cifsInodeInfo *cinode);extern int cifs_unlock_range (struct cifsFileInfo *cfile,struct file_lock *flock,const unsigned int xid);extern int cifs_push_mandatory_locks (struct cifsFileInfo *cfile);
fs/cifs/file.c +28 -3
@@ -2608,12 +2608,20 @@ cifs_strict_writev(struct kiocb *iocb, const struct iovec *iov,struct cifs_tcon *tcon =tlink_tcon (cfile->tlink);ssize_t written; + written =cifs_get_writer (cinode); +if (written) +return written; +if (CIFS_CACHE_WRITE (cinode)) {if (cap_unix (tcon->ses) && (CIFS_UNIX_FCNTL_CAP &le64_to_cpu (tcon->fsUnixInfo.Capability)) - && ((cifs_sb->mnt_cifs_flags &CIFS_MOUNT_NOPOSIXBRL ) ==0 )) -return generic_file_aio_write (iocb, iov, nr_segs, pos); -return cifs_writev (iocb, iov, nr_segs, pos); + && ((cifs_sb->mnt_cifs_flags &CIFS_MOUNT_NOPOSIXBRL ) ==0 )) { + written =generic_file_aio_write ( + iocb, iov, nr_segs, pos); + goto out; + } + written =cifs_writev (iocb, iov, nr_segs, pos); + goto out; }/* * For non-oplocked files in strict cache mode we need to write the data
@@ -2633,6 +2641,8 @@ cifs_strict_writev(struct kiocb *iocb, const struct iovec *iov, inode); cinode->oplock =0 ; } +out: +cifs_put_writer (cinode);return written; }
@@ -3644,6 +3654,13 @@ static int cifs_launder_page(struct page *page)return rc; } +static int +cifs_pending_writers_wait (void *unused) +{ +schedule (); +return 0 ; +} +void cifs_oplock_break (struct work_struct *work) { struct cifsFileInfo *cfile = container_of(work, struct cifsFileInfo,
@@ -3651,8 +3668,15 @@ void cifs_oplock_break(struct work_struct *work)struct inode *inode = cfile->dentry->d_inode;struct cifsInodeInfo *cinode =CIFS_I (inode);struct cifs_tcon *tcon =tlink_tcon (cfile->tlink); +struct TCP_Server_Info *server = tcon->ses->server;int rc =0 ; +wait_on_bit (&cinode->flags,CIFS_INODE_PENDING_WRITERS , + cifs_pending_writers_wait,TASK_UNINTERRUPTIBLE ); + + server->ops->downgrade_oplock (server, cinode, +test_bit (CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2 , &cinode->flags)); +if (!CIFS_CACHE_WRITE (cinode) &&CIFS_CACHE_READ (cinode) &&cifs_has_mand_locks (cinode)) { cifs_dbg(FYI, "Reset oplock to None for inode=%p due to mand locks\n",
@@ -3689,6 +3713,7 @@ void cifs_oplock_break(struct work_struct *work) cinode);cifs_dbg (FYI ,"Oplock release rc = %d\n" , rc); } +cifs_done_oplock_break (cinode); }/*
fs/cifs/misc.c +72 -2
86 lines not on this page · raw message
fs/cifs/smb1ops.c +11 -0
@@ -372,6 +372,16 @@ coalesce_t2(char *second_buf, struct smb_hdr *target_hdr)return 0 ; } +static void +cifs_downgrade_oplock (struct TCP_Server_Info *server, +struct cifsInodeInfo *cinode,bool set_level2) +{ +if (set_level2) +cifs_set_oplock_level (cinode,OPLOCK_READ ); +else +cifs_set_oplock_level (cinode,0 ); +} +static bool cifs_check_trans2 (struct mid_q_entry *mid,struct TCP_Server_Info *server,char *buf,int malformed)
@@ -1019,6 +1029,7 @@ struct smb_version_operations smb1_operations = { .clear_stats = cifs_clear_stats, .print_stats = cifs_print_stats, .is_oplock_break = is_valid_oplock_break, + .downgrade_oplock = cifs_downgrade_oplock, .check_trans2 = cifs_check_trans2, .need_neg = cifs_need_neg, .negotiate = cifs_negotiate,
fs/cifs/smb2misc.c +15 -3
@@ -575,9 +575,21 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)else cfile->oplock_break_cancelled = false; - server->ops->set_oplock_level (cinode, - rsp->OplockLevel ?SMB2_OPLOCK_LEVEL_II :0 , -0 ,NULL ); +set_bit (CIFS_INODE_PENDING_OPLOCK_BREAK , + &cinode->flags); + +/* +* Set flag if the server downgrades the oplock +* to L2 else clear. +*/ +if (rsp->OplockLevel) +set_bit ( +CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2 , + &cinode->flags); +else +clear_bit ( +CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2 , + &cinode->flags);queue_work (cifsiod_wq, &cfile->oplock_break);
fs/cifs/smb2ops.c +14 -0
@@ -905,6 +905,17 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon, }static void +smb2_downgrade_oplock (struct TCP_Server_Info *server, +struct cifsInodeInfo *cinode,bool set_level2) +{ +if (set_level2) + server->ops->set_oplock_level (cinode,SMB2_OPLOCK_LEVEL_II , +0 ,NULL ); +else + server->ops->set_oplock_level (cinode,0 ,0 ,NULL ); +} + +static void smb2_set_oplock_level (struct cifsInodeInfo *cinode,__u32 oplock,unsigned int epoch,bool *purge_cache) {
@@ -1110,6 +1121,7 @@ struct smb_version_operations smb20_operations = { .clear_stats = smb2_clear_stats, .print_stats = smb2_print_stats, .is_oplock_break = smb2_is_valid_oplock_break, + .downgrade_oplock = smb2_downgrade_oplock, .need_neg = smb2_need_neg, .negotiate = smb2_negotiate, .negotiate_wsize = smb2_negotiate_wsize,
@@ -1184,6 +1196,7 @@ struct smb_version_operations smb21_operations = { .clear_stats = smb2_clear_stats, .print_stats = smb2_print_stats, .is_oplock_break = smb2_is_valid_oplock_break, + .downgrade_oplock = smb2_downgrade_oplock, .need_neg = smb2_need_neg, .negotiate = smb2_negotiate, .negotiate_wsize = smb2_negotiate_wsize,
@@ -1259,6 +1272,7 @@ struct smb_version_operations smb30_operations = { .print_stats = smb2_print_stats, .dump_share_caps = smb2_dump_share_caps, .is_oplock_break = smb2_is_valid_oplock_break, + .downgrade_oplock = smb2_downgrade_oplock, .need_neg = smb2_need_neg, .negotiate = smb2_negotiate, .negotiate_wsize = smb2_negotiate_wsize,
fs/file_table.c +2 -2
@@ -209,10 +209,10 @@ static void drop_file_write_access(struct file *file)struct dentry *dentry = file->f_path.dentry;struct inode *inode = dentry->d_inode; -put_write_access (inode); -if (special_file (inode->i_mode))return ; + +put_write_access (inode);if (file_check_writeable (file) !=0 )return ;__mnt_drop_write (mnt);
fs/open.c +7 -19
@@ -641,23 +641,12 @@ out:static inline int __get_file_write_access (struct inode *inode,struct vfsmount *mnt) { -int error; - error =get_write_access (inode); +int error =get_write_access (inode);if (error)return error; -/* -* Do not take mount writer counts on -* special files since no writes to -* the mount itself will occur. -*/ -if (!special_file (inode->i_mode)) { -/* -* Balanced in __fput() -*/ - error =__mnt_want_write (mnt); -if (error) -put_write_access (inode); - } + error =__mnt_want_write (mnt); +if (error) +put_write_access (inode);return error; }
@@ -690,12 +679,11 @@ static int do_dentry_open(struct file *f,path_get (&f->f_path); inode = f->f_inode = f->f_path.dentry->d_inode; -if (f->f_mode &FMODE_WRITE ) { +if (f->f_mode &FMODE_WRITE && !special_file (inode->i_mode)) { error =__get_file_write_access (inode, f->f_path.mnt);if (error) goto cleanup_file; -if (!special_file (inode->i_mode)) -file_take_write (f); +file_take_write (f); } f->f_mapping = inode->i_mapping;
@@ -742,7 +730,6 @@ static int do_dentry_open(struct file *f, cleanup_all:fops_put (f->f_op);if (f->f_mode &FMODE_WRITE ) { -put_write_access (inode);if (!special_file (inode->i_mode)) {/* * We don't consider this a real
@@ -750,6 +737,7 @@ cleanup_all:* because it all happenend right * here, so just reset the state. */ +put_write_access (inode);file_reset_write (f);__mnt_drop_write (f->f_path.mnt); }
fs/super.c +4 -1
@@ -802,7 +802,10 @@ void emergency_remount(void)static DEFINE_IDA (unnamed_dev_ida);static DEFINE_SPINLOCK (unnamed_dev_lock);/* protects the above */ -static int unnamed_dev_start =0 ;/* don't bother trying below it */ +/* Many userspace utilities consider an FSID of 0 invalid. +* Always return at least 1 from get_anon_bdev. +*/ +static int unnamed_dev_start =1 ;int get_anon_bdev (dev_t *p) {
include/asm-generic/pgtable.h +23 -8
@@ -680,24 +680,35 @@ static inline int pmd_numa(pmd_t pmd)#ifndef pte_mknonnumastatic inline pte_t pte_mknonnuma (pte_t pte) { - pte =pte_clear_flags (pte, _PAGE_NUMA); -return pte_set_flags (pte, _PAGE_PRESENT|_PAGE_ACCESSED); +pteval_t val =pte_val (pte); + + val &= ~_PAGE_NUMA; + val |= (_PAGE_PRESENT|_PAGE_ACCESSED); +return __pte (val); }#endif #ifndef pmd_mknonnumastatic inline pmd_t pmd_mknonnuma (pmd_t pmd) { - pmd =pmd_clear_flags (pmd, _PAGE_NUMA); -return pmd_set_flags (pmd, _PAGE_PRESENT|_PAGE_ACCESSED); +pmdval_t val =pmd_val (pmd); + + val &= ~_PAGE_NUMA; + val |= (_PAGE_PRESENT|_PAGE_ACCESSED); + +return __pmd (val); }#endif #ifndef pte_mknumastatic inline pte_t pte_mknuma (pte_t pte) { - pte =pte_set_flags (pte, _PAGE_NUMA); -return pte_clear_flags (pte, _PAGE_PRESENT); +pteval_t val =pte_val (pte); + + val &= ~_PAGE_PRESENT; + val |= _PAGE_NUMA; + +return __pte (val); }#endif
@@ -716,8 +727,12 @@ static inline void ptep_set_numa(struct mm_struct *mm, unsigned long addr,#ifndef pmd_mknumastatic inline pmd_t pmd_mknuma (pmd_t pmd) { - pmd =pmd_set_flags (pmd, _PAGE_NUMA); -return pmd_clear_flags (pmd, _PAGE_PRESENT); +pmdval_t val =pmd_val (pmd); + + val &= ~_PAGE_PRESENT; + val |= _PAGE_NUMA; + +return __pmd (val); }#endif
include/linux/if_macvlan.h +1 -0
@@ -56,6 +56,7 @@ struct macvlan_dev {int numqueues;netdev_features_t tap_features;int minor; +int nest_level; }; static inline void macvlan_count_rx(const struct macvlan_dev *vlan,
include/linux/if_vlan.h +2 -1
@@ -73,7 +73,7 @@ static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)/* found in socket.c */ extern void vlan_ioctl_set (int (*hook)(struct net *,void __user *)); -static inline int is_vlan_dev (struct net_device *dev) +static inline bool is_vlan_dev (struct net_device *dev) {return dev->priv_flags &IFF_802_1Q_VLAN ; }
@@ -158,6 +158,7 @@ struct vlan_dev_priv {#ifdef CONFIG_NET_POLL_CONTROLLER struct netpoll *netpoll;#endif +unsigned int nest_level; };static inline struct vlan_dev_priv *vlan_dev_priv (const struct net_device *dev)
include/linux/net.h +4 -11
@@ -248,24 +248,17 @@ do { \bool __net_get_random_once (void *buf,int nbytes,bool *done,struct static_key *done_key); -#ifdef HAVE_JUMP_LABEL -#define ___NET_RANDOM_STATIC_KEY_INIT ((struct static_key) \ - { .enabled = ATOMIC_INIT(0), .entries = (void *)1 }) -#else /* !HAVE_JUMP_LABEL */ -#define ___NET_RANDOM_STATIC_KEY_INIT STATIC_KEY_INIT_FALSE -#endif /* HAVE_JUMP_LABEL */ -#define net_get_random_once (buf, nbytes) \ ({ \ bool ___ret = false; \ static bool ___done = false; \ - static struct static_key ___done_key = \ - ___NET_RANDOM_STATIC_KEY_INIT; \ - if (!static_key_true(&___done_key)) \ + static struct static_key ___once_key = \ + STATIC_KEY_INIT_TRUE; \ + if (static_key_true(&___once_key)) \ ___ret = __net_get_random_once(buf, \ nbytes, \ &___done, \ - &___done_key); \ + &___once_key); \ ___ret; \ })
include/linux/netdevice.h +17 -1
@@ -1145,6 +1145,7 @@ struct net_device_ops {netdev_tx_t (*ndo_dfwd_start_xmit) (struct sk_buff *skb,struct net_device *dev,void *priv); +int (*ndo_get_lock_subclass)(struct net_device *dev); };/*
@@ -2861,7 +2862,12 @@ static inline void netif_addr_lock(struct net_device *dev)static inline void netif_addr_lock_nested (struct net_device *dev) { -spin_lock_nested (&dev->addr_list_lock,SINGLE_DEPTH_NESTING ); +int subclass =SINGLE_DEPTH_NESTING ; + +if (dev->netdev_ops->ndo_get_lock_subclass) + subclass = dev->netdev_ops->ndo_get_lock_subclass (dev); + +spin_lock_nested (&dev->addr_list_lock, subclass); }static inline void netif_addr_lock_bh (struct net_device *dev)
@@ -2988,6 +2994,14 @@ void *netdev_lower_get_next_private_rcu(struct net_device *dev,priv ; \ priv = netdev_lower_get_next_private_rcu(dev, &(iter))) +void *netdev_lower_get_next (struct net_device *dev, +struct list_head **iter); +#define netdev_for_each_lower_dev (dev, ldev, iter) \ + for (iter = &(dev)->adj_list.lower, \ + ldev = netdev_lower_get_next(dev, &(iter)); \ + ldev; \ + ldev = netdev_lower_get_next(dev, &(iter))) +void *netdev_adjacent_get_private (struct list_head *adj_list);void *netdev_lower_get_first_private_rcu (struct net_device *dev);struct net_device *netdev_master_upper_dev_get (struct net_device *dev);
@@ -3003,6 +3017,8 @@ void netdev_upper_dev_unlink(struct net_device *dev,void netdev_adjacent_rename_links (struct net_device *dev,char *oldname);void *netdev_lower_dev_get_private (struct net_device *dev,struct net_device *lower_dev); +int dev_get_nest_level (struct net_device *dev, +bool (*type_check)(struct net_device *dev));int skb_checksum_help (struct sk_buff *skb);struct sk_buff *__skb_gso_segment (struct sk_buff *skb,netdev_features_t features,bool tx_path);
include/linux/preempt.h +2 -0
@@ -15,6 +15,8 @@*/ #define PREEMPT_NEED_RESCHED 0x80000000 +#define tif_need_resched () test_thread_flag(TIF_NEED_RESCHED) +#include <asm/preempt.h> #if defined(CONFIG_DEBUG_PREEMPT ) || defined(CONFIG_PREEMPT_TRACER )
include/linux/rtnetlink.h +5 -0
@@ -4,6 +4,7 @@#include <linux/mutex.h> #include <linux/netdevice.h> +#include <linux/wait.h> #include <uapi/linux/rtnetlink.h> extern int rtnetlink_send (struct sk_buff *skb,struct net *net,u32 pid,u32 group,int echo);
@@ -22,6 +23,10 @@ extern void rtnl_lock(void);extern void rtnl_unlock (void );extern int rtnl_trylock (void );extern int rtnl_is_locked (void ); + +extern wait_queue_head_t netdev_unregistering_wq; +extern struct mutex net_mutex; +#ifdef CONFIG_PROVE_LOCKING extern int lockdep_rtnl_is_held (void );#else
include/linux/sched.h +19 -1
@@ -1688,6 +1688,24 @@ static inline pid_t task_tgid_vnr(struct task_struct *tsk) } +static int pid_alive (const struct task_struct *p); +static inline pid_t task_ppid_nr_ns (const struct task_struct *tsk,struct pid_namespace *ns) +{ +pid_t pid =0 ; + +rcu_read_lock (); +if (pid_alive (tsk)) + pid =task_tgid_nr_ns (rcu_dereference (tsk->real_parent), ns); +rcu_read_unlock (); + +return pid; +} + +static inline pid_t task_ppid_nr (const struct task_struct *tsk) +{ +return task_ppid_nr_ns (tsk, &init_pid_ns); +} +static inline pid_t task_pgrp_nr_ns (struct task_struct *tsk,struct pid_namespace *ns) {
@@ -1727,7 +1745,7 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)* * Return: 1 if the process is alive. 0 otherwise. */ -static inline int pid_alive (struct task_struct *p) +static inline int pid_alive (const struct task_struct *p) {return p->pids[PIDTYPE_PID ].pid !=NULL ; }
include/linux/sock_diag.h +1 -1
@@ -23,7 +23,7 @@ int sock_diag_check_cookie(void *sk, __u32 *cookie);void sock_diag_save_cookie (void *sk,__u32 *cookie);int sock_diag_put_meminfo (struct sock *sk,struct sk_buff *skb,int attr); -int sock_diag_put_filterinfo (struct user_namespace *user_ns,struct sock *sk, +int sock_diag_put_filterinfo (struct sock *sk,struct sk_buff *skb,int attrtype);#endif
include/linux/thread_info.h +0 -2
@@ -118,8 +118,6 @@ static inline __deprecated void set_need_resched(void)*/ } -#define tif_need_resched () test_thread_flag(TIF_NEED_RESCHED) -#if definedTIF_RESTORE_SIGMASK && !definedHAVE_SET_RESTORE_SIGMASK /* * An arch can define its own version of set_restore_sigmask() to get the
include/net/af_vsock.h +5 -1
@@ -155,7 +155,11 @@ struct vsock_transport {/**** CORE ****/ -int vsock_core_init (const struct vsock_transport *t); +int __vsock_core_init (const struct vsock_transport *t,struct module *owner); +static inline int vsock_core_init (const struct vsock_transport *t) +{ +return __vsock_core_init (t,THIS_MODULE ); +}void vsock_core_exit (void );/**** UTILS ****/
include/net/ip6_route.h +5 -0
@@ -32,6 +32,11 @@ struct route_info {#define RT6_LOOKUP_F_SRCPREF_PUBLIC 0x00000010#define RT6_LOOKUP_F_SRCPREF_COA 0x00000020 +/* We do not (yet ?) support IPv6 jumbograms (RFC 2675) +* Unlike IPv4, hdr->seg_len doesn't include the IPv6 header +*/ +#define IP6_MAX_MTU (0xFFFF + sizeof(struct ipv6hdr)) +/* * rt6_srcprefs2flags() and rt6_flags2srcprefs() translate * between IPV6_ADDR_PREFERENCES socket option values
include/net/netfilter/nf_conntrack_extend.h +2 -2
@@ -47,8 +47,8 @@ enum nf_ct_ext_id {/* Extensions: optional stuff which isn't permanently in struct. */ struct nf_ct_ext {struct rcu_head rcu; -u8 offset[NF_CT_EXT_NUM ]; -u8 len; +u16 offset[NF_CT_EXT_NUM ]; +u16 len;char data[0 ]; };
include/net/netfilter/nf_tables_core.h +10 -0
@@ -13,6 +13,16 @@ struct nft_cmp_fast_expr {u8 len; }; +/* Calculate the mask for the nft_cmp_fast expression. On big endian the +* mask needs to include the *upper* bytes when interpreting that data as +* something smaller than the full u32, therefore a cpu_to_le32 is done. +*/ +static inline u32 nft_cmp_fast_mask (unsigned int len) +{ + return cpu_to_le32(~0U >> (FIELD_SIZEOF(struct nft_cmp_fast_expr, + data) * BITS_PER_BYTE - len)); +} +extern const struct nft_expr_ops nft_cmp_fast_ops;int nft_cmp_module_init (void );
include/net/sctp/structs.h +16 -2
@@ -1241,6 +1241,7 @@ struct sctp_endpoint {/* SCTP-AUTH: endpoint shared keys */ struct list_head endpoint_shared_keys;__u16 active_key_id; +__u8 auth_enable; };/* Recover the outter endpoint structure. */
@@ -1269,7 +1270,8 @@ struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *,int sctp_has_association (struct net *net,const union sctp_addr *laddr,const union sctp_addr *paddr); -int sctp_verify_init (struct net *net,const struct sctp_association *asoc, +int sctp_verify_init (struct net *net,const struct sctp_endpoint *ep, +const struct sctp_association *asoc,sctp_cid_t ,sctp_init_chunk_t *peer_init,struct sctp_chunk *chunk,struct sctp_chunk **err_chunk); int sctp_process_init(struct sctp_association *, struct sctp_chunk *chunk,
@@ -1653,6 +1655,17 @@ struct sctp_association {/* This is the last advertised value of rwnd over a SACK chunk. */ __u32 a_rwnd; +/* Number of bytes by which the rwnd has slopped. The rwnd is allowed +* to slop over a maximum of the association's frag_point. +*/ +__u32 rwnd_over; + +/* Keeps treack of rwnd pressure. This happens when we have +* a window, but not recevie buffer (i.e small packets). This one +* is releases slowly (1 PMTU at a time ). +*/ +__u32 rwnd_press; +/* This is the sndbuf size in use for the association. * This corresponds to the sndbuf size for the association, * as specified in the sk->sndbuf.
@@ -1881,7 +1894,8 @@ void sctp_assoc_update(struct sctp_association *old,__u32 sctp_association_get_next_tsn (struct sctp_association *);void sctp_assoc_sync_pmtu (struct sock *,struct sctp_association *); -void sctp_assoc_rwnd_update (struct sctp_association *,bool ); +void sctp_assoc_rwnd_increase (struct sctp_association *,unsigned int ); +void sctp_assoc_rwnd_decrease (struct sctp_association *,unsigned int );void sctp_assoc_set_primary (struct sctp_association *,struct sctp_transport *); void sctp_assoc_del_nonprimary_peers(struct sctp_association *,
include/scsi/scsi_device.h +1 -2
@@ -257,7 +257,7 @@ struct scsi_target {struct list_head siblings;struct list_head devices;struct device dev; -unsigned int reap_ref;/* protected by the host lock */ +struct kref reap_ref;/* last put renders target invisible */ unsigned int channel;unsigned int id;/* target id ... replace * scsi_device.id eventually */
@@ -284,7 +284,6 @@ struct scsi_target {#define SCSI_DEFAULT_TARGET_BLOCKED 3char scsi_level; -struct execute_work ew;enum scsi_target_state state;void *hostdata;/* available to low-level driver */ unsigned long starget_data[0 ];/* for the transport */
include/trace/events/block.h +30 -3
@@ -132,6 +132,7 @@ DEFINE_EVENT(block_rq_with_error, block_rq_requeue,* block_rq_complete - block IO operation completed by device driver * @q: queue containing the block operation request * @rq: block operations request +* @nr_bytes: number of completed bytes * * The block_rq_complete tracepoint event indicates that some portion * of operation request has been completed by the device driver. If
@@ -139,11 +140,37 @@ DEFINE_EVENT(block_rq_with_error, block_rq_requeue,* do for the request. If @rq->bio is non-NULL then there is * additional work required to complete the request. */ -DEFINE_EVENT (block_rq_with_error, block_rq_complete, +TRACE_EVENT (block_rq_complete, - TP_PROTO(struct request_queue *q, struct request *rq), + TP_PROTO(struct request_queue *q, struct request *rq, + unsigned int nr_bytes), -TP_ARGS (q, rq) +TP_ARGS (q, rq, nr_bytes), + +TP_STRUCT__entry ( + __field( dev_t, dev ) + __field( sector_t, sector ) + __field( unsigned int, nr_sector ) + __field( int, errors ) + __array( char, rwbs, RWBS_LEN ) +__dynamic_array ( char, cmd,blk_cmd_buf_len (rq) ) + ), + +TP_fast_assign ( + __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; + __entry->sector = blk_rq_pos(rq); + __entry->nr_sector = nr_bytes >> 9; + __entry->errors = rq->errors; + + blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, nr_bytes); + blk_dump_cmd(__get_str(cmd), rq); + ), + +TP_printk ("%d,%d %s (%s) %llu + %u [%d]" , +MAJOR (__entry->dev),MINOR (__entry->dev), + __entry->rwbs,__get_str (cmd), + (unsigned long long )__entry->sector, + __entry->nr_sector, __entry->errors) ); DECLARE_EVENT_CLASS(block_rq,
init/Kconfig +12 -12
@@ -1621,6 +1621,18 @@ config MMAP_ALLOW_UNINITIALIZED See Documentation/nommu-mmap.txt for more information. +config SYSTEM_TRUSTED_KEYRING + bool "Provide system-wide ring of trusted keys" + depends on KEYS + help + Provide a system keyring to which trusted keys can be added. Keys in + the keyring are considered to be trusted. Keys may be added at will + by the kernel from compiled-in data and from hardware key stores, but + userspace may only add extra keys if those keys can be verified by + keys already in the keyring. + + Keys in this keyring are used by module signature checking. + config PROFILING bool "Profiling support" help
@@ -1656,18 +1668,6 @@ config BASE_SMALL default 0 if BASE_FULL default 1 if !BASE_FULL -config SYSTEM_TRUSTED_KEYRING - bool "Provide system-wide ring of trusted keys" - depends on KEYS - help - Provide a system keyring to which trusted keys can be added. Keys in - the keyring are considered to be trusted. Keys may be added at will - by the kernel from compiled-in data and from hardware key stores, but - userspace may only add extra keys if those keys can be verified by - keys already in the keyring. - - Keys in this keyring are used by module signature checking. - menuconfig MODULES bool "Enable loadable module support" option modules
kernel/audit.c +2 -2
@@ -1829,10 +1829,10 @@ void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk)spin_unlock_irq (&tsk->sighand->siglock); audit_log_format(ab, - " ppid=%ld pid=%d auid=%u uid=%u gid=%u" + " ppid=%d pid=%d auid=%u uid=%u gid=%u" " euid=%u suid=%u fsuid=%u" " egid=%u sgid=%u fsgid=%u tty=%s ses=%u", - sys_getppid(), + task_ppid_nr(tsk), tsk->pid, from_kuid(&init_user_ns, audit_get_loginuid(tsk)), from_kuid(&init_user_ns, cred->uid),
kernel/auditsc.c +1 -1
@@ -459,7 +459,7 @@ static int audit_filter_rules(struct task_struct *tsk,case AUDIT_PPID :if (ctx) {if (!ctx->ppid) - ctx->ppid =sys_getppid (); + ctx->ppid =task_ppid_nr (tsk); result =audit_comparator (ctx->ppid, f->op, f->val); }break ;
kernel/time/tick-common.c +1 -1
@@ -276,7 +276,7 @@ static bool tick_check_preferred(struct clock_event_device *curdev,bool tick_check_replacement (struct clock_event_device *curdev,struct clock_event_device *newdev) { -if (tick_check_percpu (curdev, newdev,smp_processor_id ())) +if (!tick_check_percpu (curdev, newdev,smp_processor_id ()))return false;return tick_check_preferred (curdev, newdev);
kernel/time/tick-sched.c +4 -1
@@ -84,6 +84,9 @@ static void tick_do_update_jiffies64(ktime_t now)/* Keep the tick_next_period variable up to date */ tick_next_period =ktime_add (last_jiffies_update, tick_period); + }else { +write_sequnlock (&jiffies_lock); +return ; }write_sequnlock (&jiffies_lock);update_wall_time ();
@@ -967,7 +970,7 @@ static void tick_nohz_switch_to_nohz(void)struct tick_sched *ts = &__get_cpu_var (tick_cpu_sched);ktime_t next; -if (!tick_nohz_active) +if (!tick_nohz_enabled)return ;local_irq_disable ();
kernel/trace/blktrace.c +11 -9
@@ -702,6 +702,7 @@ void blk_trace_shutdown(struct request_queue *q)* blk_add_trace_rq - Add a trace for a request oriented action * @q: queue the io is for * @rq: the source request +* @nr_bytes: number of completed bytes * @what: the action * * Description:
@@ -709,7 +710,7 @@ void blk_trace_shutdown(struct request_queue *q)* **/ static void blk_add_trace_rq (struct request_queue *q,struct request *rq, -u32 what) +unsigned int nr_bytes,u32 what) {struct blk_trace *bt = q->blk_trace;
@@ -718,11 +719,11 @@ static void blk_add_trace_rq(struct request_queue *q, struct request *rq,if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) { what |=BLK_TC_ACT (BLK_TC_PC ); -__blk_add_trace (bt,0 ,blk_rq_bytes (rq), rq->cmd_flags, +__blk_add_trace (bt,0 , nr_bytes, rq->cmd_flags, what, rq->errors, rq->cmd_len, rq->cmd); }else { what |=BLK_TC_ACT (BLK_TC_FS ); -__blk_add_trace (bt,blk_rq_pos (rq),blk_rq_bytes (rq), +__blk_add_trace (bt,blk_rq_pos (rq), nr_bytes, rq->cmd_flags, what, rq->errors,0 ,NULL ); } }
@@ -730,33 +731,34 @@ static void blk_add_trace_rq(struct request_queue *q, struct request *rq,static void blk_add_trace_rq_abort (void *ignore,struct request_queue *q,struct request *rq) { -blk_add_trace_rq (q, rq,BLK_TA_ABORT ); +blk_add_trace_rq (q, rq,blk_rq_bytes (rq),BLK_TA_ABORT ); }static void blk_add_trace_rq_insert (void *ignore,struct request_queue *q,struct request *rq) { -blk_add_trace_rq (q, rq,BLK_TA_INSERT ); +blk_add_trace_rq (q, rq,blk_rq_bytes (rq),BLK_TA_INSERT ); }static void blk_add_trace_rq_issue (void *ignore,struct request_queue *q,struct request *rq) { -blk_add_trace_rq (q, rq,BLK_TA_ISSUE ); +blk_add_trace_rq (q, rq,blk_rq_bytes (rq),BLK_TA_ISSUE ); }static void blk_add_trace_rq_requeue (void *ignore,struct request_queue *q,struct request *rq) { -blk_add_trace_rq (q, rq,BLK_TA_REQUEUE ); +blk_add_trace_rq (q, rq,blk_rq_bytes (rq),BLK_TA_REQUEUE ); }static void blk_add_trace_rq_complete (void *ignore,struct request_queue *q, -struct request *rq) +struct request *rq, +unsigned int nr_bytes) { -blk_add_trace_rq (q, rq,BLK_TA_COMPLETE ); +blk_add_trace_rq (q, rq, nr_bytes,BLK_TA_COMPLETE ); }/**
kernel/trace/trace_events_trigger.c +1 -1
@@ -77,7 +77,7 @@ event_triggers_call(struct ftrace_event_file *file, void *rec) data->ops->func (data);continue ; } - filter =rcu_dereference (data->filter); + filter =rcu_dereference_sched (data->filter);if (filter && !filter_match_preds (filter, rec))continue ;if (data->cmd_ops->post_trigger) {
kernel/trace/trace_uprobe.c +6 -0
@@ -728,9 +728,15 @@ static int uprobe_buffer_enable(void)static void uprobe_buffer_disable (void ) { +int cpu; +BUG_ON (!mutex_is_locked (&event_mutex));if (--uprobe_buffer_refcnt ==0 ) { +for_each_possible_cpu (cpu) +free_page ((unsigned long )per_cpu_ptr (uprobe_cpu_buffer, + cpu)->buf); +free_percpu (uprobe_cpu_buffer); uprobe_cpu_buffer =NULL ; }
kernel/tracepoint.c +6 -0
@@ -641,6 +641,9 @@ static int tracepoint_module_coming(struct module *mod)struct tp_module *tp_mod, *iter;int ret =0 ; +if (!mod->num_tracepoints) +return 0 ; +/* * We skip modules that taint the kernel, especially those with different * module headers (for forced load), to make sure we don't cause a crash.
@@ -684,6 +687,9 @@ static int tracepoint_module_going(struct module *mod) {struct tp_module *pos; +if (!mod->num_tracepoints) +return 0 ; +mutex_lock (&tracepoints_mutex);tracepoint_update_probe_range (mod->tracepoints_ptrs, mod->tracepoints_ptrs + mod->num_tracepoints);
mm/huge_memory.c +10 -3
@@ -1611,16 +1611,23 @@ pmd_t *page_check_address_pmd(struct page *page,enum page_check_address_pmd_flag flag, spinlock_t **ptl) { + pgd_t *pgd; +pud_t *pud;pmd_t *pmd;if (address & ~HPAGE_PMD_MASK )return NULL ; - pmd =mm_find_pmd (mm, address); -if (!pmd) + pgd =pgd_offset (mm, address); +if (!pgd_present (*pgd))return NULL ; + pud =pud_offset (pgd, address); +if (!pud_present (*pud)) +return NULL ; + pmd =pmd_offset (pud, address); + *ptl =pmd_lock (mm, pmd); -if (pmd_none (*pmd)) +if (!pmd_present (*pmd)) goto unlock;if (pmd_page (*pmd) != page) goto unlock;
mm/hugetlb.c +1 -0
@@ -1134,6 +1134,7 @@ static void return_unused_surplus_pages(struct hstate *h,while (nr_pages--) {if (!free_pool_huge_page (h, &node_states[N_MEMORY ],1 ))break ; +cond_resched_lock (&hugetlb_lock); } }
net/8021q/vlan.c +1 -0
@@ -169,6 +169,7 @@ int register_vlan_dev(struct net_device *dev)if (err <0 ) goto out_uninit_mvrp; + vlan->nest_level =dev_get_nest_level (real_dev, is_vlan_dev) +1 ; err =register_netdevice (dev);if (err <0 ) goto out_uninit_mvrp;
net/8021q/vlan_dev.c +8 -5
@@ -524,6 +524,11 @@ static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass)netdev_for_each_tx_queue (dev, vlan_dev_set_lockdep_one, &subclass); } +static int vlan_dev_get_lock_subclass (struct net_device *dev) +{ +return vlan_dev_priv (dev)->nest_level; +} +static const struct header_ops vlan_header_ops = { .create = vlan_dev_hard_header, .rebuild = vlan_dev_rebuild_header,
@@ -559,7 +564,7 @@ static const struct net_device_ops vlan_netdev_ops;static int vlan_dev_init (struct net_device *dev) {struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; -int subclass =0 , i; +int i;netif_carrier_off (dev);
@@ -608,10 +613,7 @@ static int vlan_dev_init(struct net_device *dev)SET_NETDEV_DEVTYPE (dev, &vlan_type); -if (is_vlan_dev (real_dev)) - subclass =1 ; - -vlan_dev_set_lockdep_class (dev, subclass); +vlan_dev_set_lockdep_class (dev,vlan_dev_get_lock_subclass (dev)); vlan_dev_priv(dev)->vlan_pcpu_stats = alloc_percpu(struct vlan_pcpu_stats);if (!vlan_dev_priv (dev)->vlan_pcpu_stats)
@@ -791,6 +793,7 @@ static const struct net_device_ops vlan_netdev_ops = { .ndo_netpoll_cleanup = vlan_dev_netpoll_cleanup, #endif .ndo_fix_features = vlan_dev_fix_features, + .ndo_get_lock_subclass = vlan_dev_get_lock_subclass, };void vlan_setup (struct net_device *dev)
net/batman-adv/bat_iv_ogm.c +2 -0
@@ -1545,6 +1545,8 @@ out_neigh:if ((orig_neigh_node) && (!is_single_hop_neigh))batadv_orig_node_free_ref (orig_neigh_node); out: +if (router_ifinfo) +batadv_neigh_ifinfo_free_ref (router_ifinfo);if (router)batadv_neigh_node_free_ref (router);if (router_router)
net/batman-adv/distributed-arp-table.c +1 -2
@@ -940,8 +940,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,* additional DAT answer may trigger kernel warnings about * a packet coming from the wrong port. */ -if (batadv_is_my_client (bat_priv, dat_entry->mac_addr, -BATADV_NO_FLAGS )) { +if (batadv_is_my_client (bat_priv, dat_entry->mac_addr, vid)) { ret = true; goto out; }
net/batman-adv/fragmentation.c +8 -3
@@ -418,12 +418,13 @@ bool batadv_frag_send_packet(struct sk_buff *skb, struct batadv_neigh_node *neigh_node) {struct batadv_priv *bat_priv; -struct batadv_hard_iface *primary_if; +struct batadv_hard_iface *primary_if =NULL ;struct batadv_frag_packet frag_header;struct sk_buff *skb_fragment;unsigned mtu = neigh_node->if_incoming->net_dev->mtu;unsigned header_size =sizeof (frag_header);unsigned max_fragment_size, max_packet_size; +bool ret = false;/* To avoid merge and refragmentation at next-hops we never send * fragments larger than BATADV_FRAG_MAX_FRAG_SIZE
@@ -483,7 +484,11 @@ bool batadv_frag_send_packet(struct sk_buff *skb, skb->len + ETH_HLEN);batadv_send_skb_packet (skb, neigh_node->if_incoming, neigh_node->addr); -return true; + ret = true; + out_err: -return false; +if (primary_if) +batadv_hardif_free_ref (primary_if); + +return ret; }
net/batman-adv/gateway_client.c +9 -2
@@ -42,8 +42,10 @@static void batadv_gw_node_free_ref (struct batadv_gw_node *gw_node) { -if (atomic_dec_and_test (&gw_node->refcount)) +if (atomic_dec_and_test (&gw_node->refcount)) { +batadv_orig_node_free_ref (gw_node->orig_node);kfree_rcu (gw_node, rcu); + } } static struct batadv_gw_node *
@@ -408,9 +410,14 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv,if (gateway->bandwidth_down ==0 )return ; +if (!atomic_inc_not_zero (&orig_node->refcount)) +return ; + gw_node =kzalloc (sizeof (*gw_node),GFP_ATOMIC ); -if (!gw_node) +if (!gw_node) { +batadv_orig_node_free_ref (orig_node);return ; + }INIT_HLIST_NODE (&gw_node->list); gw_node->orig_node = orig_node;
net/batman-adv/originator.c +57 -5
105 lines not on this page · raw message
net/bridge/br_input.c +1 -1
@@ -73,7 +73,7 @@ int br_handle_frame_finish(struct sk_buff *skb) goto drop;if (!br_allowed_ingress (p->br,nbp_get_vlan_info (p), skb, &vid)) - goto drop; + goto out;/* insert into forwarding database after filtering to avoid spoofing */ br = p->br;
net/bridge/br_netlink.c +15 -0
@@ -445,6 +445,20 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[])return 0 ; } +static int br_dev_newlink (struct net *src_net,struct net_device *dev, +struct nlattr *tb[],struct nlattr *data[]) +{ +struct net_bridge *br =netdev_priv (dev); + +if (tb[IFLA_ADDRESS ]) { +spin_lock_bh (&br->lock); +br_stp_change_bridge_id (br,nla_data (tb[IFLA_ADDRESS ])); +spin_unlock_bh (&br->lock); + } + +return register_netdevice (dev); +} +static size_t br_get_link_af_size (const struct net_device *dev) {struct net_port_vlans *pv;
@@ -473,6 +487,7 @@ struct rtnl_link_ops br_link_ops __read_mostly = { .priv_size = sizeof(struct net_bridge), .setup = br_dev_setup, .validate = br_validate, + .newlink = br_dev_newlink, .dellink = br_dev_delete, };
net/bridge/br_vlan.c +4 -3
@@ -170,7 +170,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,* rejected. */ if (!v) -return false; + goto drop;/* If vlan tx offload is disabled on bridge device and frame was * sent from vlan device on the bridge device, it does not have
@@ -193,7 +193,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,* vlan untagged or priority-tagged traffic belongs to. */ if (pvid ==VLAN_N_VID ) -return false; + goto drop;/* PVID is set on this port. Any untagged or priority-tagged * ingress frame is considered to belong to this vlan.
@@ -216,7 +216,8 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,/* Frame had a valid vlan tag. See if vlan is allowed */ if (test_bit (*vid, v->vlan_bitmap))return true; - +drop: +kfree_skb (skb);return false; }
net/bridge/netfilter/ebtables.c +2 -3
@@ -1044,10 +1044,9 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,if (repl->num_counters &©_to_user (repl->counters, counterstmp, repl->num_counters *sizeof (struct ebt_counter ))) { - ret = -EFAULT ; +/* Silent error, can't fail, new table is already in place */ +net_warn_ratelimited ("ebtables: counters copy to user failed while replacing table\n" ); } -else - ret =0 ;/* decrease module count and free resources */ EBT_ENTRY_ITERATE(table->entries, table->entries_size,
net/core/dev.c +54 -2
47 lines not on this page · raw message
net/core/rtnetlink.c +54 -12
66 lines not on this page · raw message
net/sctp/associola.c +65 -17
82 lines not on this page · raw message
net/sctp/socket.c +73 -29
102 lines not on this page · raw message
net/vmw_vsock/af_vsock.c +22 -25
47 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.