Linux 3.14.54
Greg KH
maintainerI'm announcing the release of the 3.14.54 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/arm64/Kconfig | 20 + arch/arm64/Makefile | 4 arch/arm64/kernel/head.S | 5 arch/arm64/kernel/module.c | 2 arch/arm64/kernel/signal32.c | 47 ++- arch/arm64/kvm/hyp.S | 5 arch/parisc/kernel/irq.c | 8 arch/parisc/kernel/syscall.S | 2 arch/powerpc/include/asm/pgtable-ppc64.h | 14 - arch/powerpc/include/asm/rtas.h | 1 arch/powerpc/kernel/rtas.c | 17 + arch/powerpc/mm/hugepage-hash64.c | 3 arch/powerpc/platforms/pseries/ras.c | 3 arch/x86/kernel/entry_64.S | 296 ++++++++++++++-------- arch/x86/kernel/nmi.c | 123 +++------ arch/x86/mm/init_32.c | 1 block/blk-mq-sysfs.c | 25 + drivers/base/node.c | 10 drivers/block/nvme-core.c | 2 drivers/gpu/drm/radeon/radeon_combios.c | 8 drivers/iio/gyro/Kconfig | 3 drivers/infiniband/core/uverbs.h | 3 drivers/infiniband/core/uverbs_cmd.c | 10 drivers/infiniband/core/uverbs_main.c | 43 ++- drivers/infiniband/hw/mlx4/ah.c | 6 drivers/infiniband/hw/mlx4/sysfs.c | 5 drivers/infiniband/hw/qib/qib_keys.c | 4 drivers/infiniband/hw/qib/qib_verbs.c | 14 - drivers/infiniband/hw/qib/qib_verbs.h | 2 drivers/input/evdev.c | 13 drivers/isdn/gigaset/ser-gigaset.c | 11 drivers/md/raid10.c | 5 drivers/media/platform/omap3isp/isp.c | 4 drivers/media/rc/rc-main.c | 3 drivers/mmc/core/core.c | 6 drivers/net/bonding/bond_main.c | 21 + drivers/net/ethernet/broadcom/tg3.c | 2 drivers/net/ethernet/brocade/bna/bnad.c | 2 drivers/net/ethernet/mellanox/mlx4/eq.c | 4 drivers/net/ethernet/stmicro/stmmac/descs.h | 2 drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 3 drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 3 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 44 +-- drivers/net/usb/usbnet.c | 7 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 drivers/xen/gntdev.c | 40 +- fs/btrfs/transaction.c | 3 fs/cifs/ioctl.c | 6 fs/coredump.c | 38 ++ fs/hfs/bnode.c | 9 fs/hfs/brec.c | 20 - fs/hfsplus/bnode.c | 3 fs/nfs/nfs4proc.c | 3 fs/nfs/pagelist.c | 4 fs/udf/inode.c | 16 + include/net/ip.h | 1 kernel/fork.c | 28 +- mm/vmscan.c | 2 net/bridge/br_mdb.c | 3 net/core/datagram.c | 45 +++ net/core/dev.c | 38 +- net/core/fib_rules.c | 14 - net/core/pktgen.c | 4 net/core/rtnetlink.c | 128 ++++----- net/ipv4/af_inet.c | 2 net/ipv4/datagram.c | 16 - net/ipv4/gre_offload.c | 2 net/ipv4/ip_fragment.c | 7 net/ipv4/ip_tunnel.c | 8 net/ipv4/udp.c | 15 - net/ipv6/datagram.c | 20 + net/ipv6/exthdrs_offload.c | 2 net/ipv6/ip6_gre.c | 1 net/ipv6/ip6_input.c | 6 net/ipv6/ip6_offload.c | 2 net/ipv6/ip6mr.c | 2 net/mac80211/tx.c | 3 net/mpls/mpls_gso.c | 2 net/netlink/af_netlink.c | 109 +++++--- net/netlink/af_netlink.h | 9 net/openvswitch/datapath.c | 2 net/openvswitch/flow_table.c | 21 - net/openvswitch/flow_table.h | 2 net/packet/af_packet.c | 8 net/rds/info.c | 2 net/sctp/protocol.c | 64 +++- net/tipc/socket.c | 1 sound/pci/hda/patch_realtek.c | 6 89 files changed, 1006 insertions(+), 532 deletions(-)
Adrien Schildknecht (1):
rtlwifi: rtl8192cu: Add new device ID
Alexey Brodkin (1):
stmmac: troubleshoot unexpected bits in des0 & des1
Andy Lutomirski (6):
x86/nmi: Enable nested do_nmi() handling for 64-bit kernels x86/nmi/64: Remove asm code that saves CR2
x86/nmi/64: Switch stacks on userspace NMI entry x86/nmi/64: Improve nested NMI comments
x86/nmi/64: Reorder nested NMI checks
x86/nmi/64: Use DF to avoid userspace RSP confusing nested NMI detection
Aneesh Kumar K.V (1):
powerpc/mm: Recompute hash value after a failed update
Angga (1):
ipv6: Make MLD packets to only be processed locally
Bob Copeland (1):
mac80211: enable assoc check for mesh interfaces
Christoph Hellwig (1):
IB/uverbs: reject invalid or unknown opcodes
Dan Carpenter (1):
rds: fix an integer overflow test in rds_info_getsockopt()
Daniel Borkmann (3):
rtnetlink: verify IFLA_VF_INFO attributes before passing them to driver
ipv6: fix exthdrs offload registration in out_rt path netlink, mmap: transform mmap skb into full skb on taps
David Härdeman (1):
rc-core: fix remove uevent generation
David Vrabel (1):
xen/gntdev: convert priv->lock to a mutex
Edward Hyunkoo Jee (1):
inet: frags: fix defragmented packet's IP header for af_packet
Eric Dumazet (3):
net: graceful exit from netif_alloc_netdev_queues()
ipv6: lock socket in ip6_datagram_connect()
udp: fix dst races with multicast early demux
Eric W. Biederman (1):
unshare: Unsharing a thread does not require unsharing a vm
Eugene Shatokhin (1):
usbnet: Get EVENT_NO_RUNTIME_PM bit before it is cleared
Filipe Manana (1):
Btrfs: check if previous transaction aborted to avoid fs corruption
Florian Westphal (2):
netlink: don't hold mutex in rcu callback when releasing mmapd ring
net: gso: use feature flag argument in all protocol gso handlers
Greg Kroah-Hartman (1):
Linux 3.14.54
Helge Deller (1):
parisc: Filter out spurious interrupts in PA-RISC irq handler
Herbert Xu (3):
net: Clone skb before setting peeked flag
net: Fix skb csum races when peeking
net: Fix skb_set_peeked use-after-free bug
Hin-Tak Leung (2):
hfs: fix B-tree corruption after insertion at position 0 hfs,hfsplus: cache pages correctly between bnode_create and bnode_free
Ivan Vecera (1):
bna: fix interrupts storm caused by erroneous packets
Jack Morgenstein (2):
IB/mlx4: Forbid using sysfs to change RoCE pkeys net/mlx4_core: Fix wrong index in propagating port change event to VFs
Jaewon Kim (1):
vmscan: fix increasing nr_isolated incurred by putback unevictable pages
Jan Kara (1):
udf: Check length of extended attributes and allocation descriptors
Jann Horn (2):
CIFS: fix type confusion in copy offload ioctl
fs: if a coredump already exists, unlink and recreate with O_EXCL
Jean Delvare (1):
tg3: Fix temperature reporting
Jeff Vander Stoep (1):
arm64: kconfig: Move LIST_POISON to a safe value
Jeffery Miller (1):
Add radeon suspend/resume quirk for HP Compaq dc5750.
Jesse Gross (1):
openvswitch: Zero flows on allocation.
Jialing Fu (1):
mmc: core: fix race condition in mmc_wait_data_done
John David Anglin (1):
parisc: Use double word condition in 64bit CAS operation
Julian Anastasov (2):
net: do not process device backlog during unregistration
net: call rcu_read_lock early in process_backlog
Keith Busch (1):
NVMe: Initialize device reference count earlier
Kinglong Mee (1):
NFS: Fix a NULL pointer dereference of migration recovery ops for v4.2 client
Lars Westerhoff (1):
packet: missing dev_put() in packet_do_bind()
Marc Zyngier (1):
arm64: KVM: Disable virtual timer even if the guest is not using it
Marcelo Ricardo Leitner (1):
sctp: fix race on protocol/netns initialization
Markus Pargmann (1):
Revert "iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required"
Michael Ellerman (1):
powerpc/mm: Fix pte_pagesize_index() crash on 4K w/64K hash
Mike Marciniszyn (1):
IB/qib: Change lkey table allocation to support more MRs
Minfei Huang (1):
x86/mm: Initialize pmd_idx in page_table_range_init_count()
Ming Lei (1):
blk-mq: fix buffer overflow when reading sysfs file of 'pending'
NeilBrown (2):
NFSv4: don't set SETATTR for O_RDONLY|O_EXCL
md/raid10: always set reshape_safe when initializing reshape_position.
Nikolay Aleksandrov (3):
bridge: mdb: zero out the local br_ip variable before use
bridge: mdb: fix double add notification
bonding: fix destruction of bond with devices different from arphrd_ether
Noa Osherovich (1):
IB/mlx4: Use correct SL on AH query under RoCE
Oleg Nesterov (1):
net: pktgen: fix race between pktgen_thread_worker() and kthread_stop()
Richard Laing (1):
net/ipv6: Correct PIM6 mrt_lock handling
Sakari Ailus (1):
v4l: omap3isp: Fix sub-device power management code
Stephen Smalley (1):
net/tipc: initialize security state for new connection socket
Takashi Iwai (3):
Input: evdev - do not report errors form flush()
ALSA: hda - Enable headphone jack detect on old Fujitsu laptops
ALSA: hda - Use ALC880_FIXUP_FUJITSU for FSC Amilo M1437
Thomas Huth (1):
powerpc/rtas: Introduce rtas_get_sensor_fast() for IRQ handlers
Tilman Schmidt (1):
isdn/gigaset: reset tty->receive_room when attaching ser_gigaset
Timo Teräs (1):
ip_tunnel: fix ipv4 pmtu check to honor inner ip header df
Trond Myklebust (1):
NFS: nfs_set_pgio_error sometimes misses errors
Will Deacon (3):
arm64: compat: fix vfp save/restore across signal handlers in big-endian
arm64: head.S: initialise mdcr_el2 in el2_setup
arm64: errata: add module build workaround for erratum #843419
Wilson Kok (1):
fib_rules: fix fib rule dumps across multiple skbs
Yinghai Lu (1):
mm: check if section present during memory block registering
Yishai Hadas (1):
IB/uverbs: Fix race between ib_uverbs_open and remove_one
dingtianhong (1):
bonding: correct the MAC address for "follow" fail_over_mac policy
huaibin Wang (1):
ip6_gre: release cached dst on tunnel removal
Greg KH
maintainerMakefile +2 -2
@@ -1,8 +1,8 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 53 +SUBLEVEL = 54 EXTRAVERSION = -NAME = Remembering Coco +NAME = Kernel Recipes 2015 # *DOCUMENTATION* # To see a list of typical targets execute "make help"
arch/arm64/Kconfig +20 -0
@@ -68,6 +68,10 @@ config NO_IOPORT config STACKTRACE_SUPPORT def_bool y +config ILLEGAL_POINTER_VALUE + hex + default 0xdead000000000000 + config LOCKDEP_SUPPORT def_bool y
@@ -302,6 +306,22 @@ menu "CPU Power Management" source "drivers/cpuidle/Kconfig" +config ARM64_ERRATUM_843419 + bool "Cortex-A53: 843419: A load or store might access an incorrect address" + depends on MODULES + default y + help + This option builds kernel modules using the large memory model in + order to avoid the use of the ADRP instruction, which can cause + a subsequent memory access to use an incorrect address on Cortex-A53 + parts up to r0p4. + + Note that the kernel itself must be linked with a version of ld + which fixes potentially affected ADRP instructions through the + use of veneers. + + If unsure, say Y. + endmenu source "net/Kconfig"
arch/arm64/Makefile +4 -0
@@ -34,6 +34,10 @@ comma = , CHECKFLAGS += -D__aarch64__ +ifeq ($(CONFIG_ARM64_ERRATUM_843419), y) +CFLAGS_MODULE += -mcmodel=large +endif + # Default value head-y := arch/arm64/kernel/head.o
arch/arm64/kernel/head.S +5 -0
@@ -203,6 +203,11 @@ CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems msr hstr_el2, xzr // Disable CP15 traps to EL2 #endif + /* EL2 debug */ + mrs x0, pmcr_el0 // Disable debug access traps + ubfx x0, x0, #11, #5 // to EL2 and allow access to + msr mdcr_el2, x0 // all PMU counters from EL1 + /* Stage-2 translation */ msr vttbr_el2, xzr
arch/arm64/kernel/module.c +2 -0
@@ -330,12 +330,14 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, ovf =reloc_insn_imm (RELOC_OP_PREL , loc, val,0 ,21 ,AARCH64_INSN_IMM_ADR );break ; +#ifndef CONFIG_ARM64_ERRATUM_843419 case R_AARCH64_ADR_PREL_PG_HI21_NC : overflow_check = false;case R_AARCH64_ADR_PREL_PG_HI21 : ovf =reloc_insn_imm (RELOC_OP_PAGE , loc, val,12 ,21 ,AARCH64_INSN_IMM_ADR );break ; +#endif case R_AARCH64_ADD_ABS_LO12_NC :case R_AARCH64_LDST8_ABS_LO12_NC : overflow_check = false;
arch/arm64/kernel/signal32.c +36 -11
79 lines not on this page · raw message
arch/arm64/kvm/hyp.S +3 -2
@@ -485,8 +485,6 @@ CPU_BE( rev w5, w5 ) mrs x3, cntv_ctl_el0 and x3, x3, #3 str w3, [x0, #VCPU_TIMER_CNTV_CTL] - bic x3, x3, #1 // Clear Enable - msr cntv_ctl_el0, x3 isb
@@ -494,6 +492,9 @@ CPU_BE( rev w5, w5 ) str x3, [x0, #VCPU_TIMER_CNTV_CVAL] 1: + // Disable the virtual timer + msr cntv_ctl_el0, xzr + // Allow physical timer/counter access for the host mrs x2, cnthctl_el2 orr x2, x2, #3
arch/parisc/kernel/irq.c +6 -2
@@ -507,8 +507,8 @@ void do_cpu_irq_mask(struct pt_regs *regs)struct pt_regs *old_regs;unsigned long eirr_val;int irq, cpu =smp_processor_id (); -#ifdef CONFIG_SMP struct irq_desc *desc; +#ifdef CONFIG_SMP cpumask_t dest;#endif
@@ -521,8 +521,12 @@ void do_cpu_irq_mask(struct pt_regs *regs) goto set_out; irq =eirr_to_irq (eirr_val); -#ifdef CONFIG_SMP +/* Filter out spurious interrupts, mostly from serial port at bootup */ desc =irq_to_desc (irq); +if (unlikely (!desc->action)) + goto set_out; + +#ifdef CONFIG_SMP cpumask_copy (&dest, desc->irq_data.affinity);if (irqd_is_per_cpu (&desc->irq_data) && !cpu_isset (smp_processor_id (), dest)) {
arch/parisc/kernel/syscall.S +1 -1
@@ -821,7 +821,7 @@ cas2_action: /* 64bit CAS */ #ifdef CONFIG_64BIT 19: ldd,ma 0(%sr3,%r26), %r29 - sub,= %r29, %r25, %r0 + sub,*= %r29, %r25, %r0 b,n cas2_end 20: std,ma %r24, 0(%sr3,%r26) copy %r0, %r28
arch/powerpc/include/asm/pgtable-ppc64.h +13 -1
@@ -135,7 +135,19 @@#define pte_iterate_hashed_end () } while(0)#ifdef CONFIG_PPC_HAS_HASH_64K -#define pte_pagesize_index (mm, addr, pte) get_slice_psize(mm, addr) +/* +* We expect this to be called only for user addresses or kernel virtual +* addresses other than the linear mapping. +*/ +#define pte_pagesize_index (mm, addr, pte) \ + ({ \ + unsigned int psize; \ + if (is_kernel_addr(addr)) \ + psize = MMU_PAGE_4K; \ + else \ + psize = get_slice_psize(mm, addr); \ + psize; \ + })#else #define pte_pagesize_index (mm, addr, pte) MMU_PAGE_4K#endif
arch/powerpc/include/asm/rtas.h +1 -0
@@ -255,6 +255,7 @@ extern void rtas_power_off(void);extern void rtas_halt (void );extern void rtas_os_term (char *str);extern int rtas_get_sensor (int sensor,int index,int *state); +extern int rtas_get_sensor_fast (int sensor,int index,int *state);extern int rtas_get_power_level (int powerdomain,int *level);extern int rtas_set_power_level (int powerdomain,int level,int *setlevel);extern bool rtas_indicator_present (int token,int *maxindex);
arch/powerpc/kernel/rtas.c +17 -0
@@ -584,6 +584,23 @@ int rtas_get_sensor(int sensor, int index, int *state) }EXPORT_SYMBOL (rtas_get_sensor); +int rtas_get_sensor_fast (int sensor,int index,int *state) +{ +int token =rtas_token ("get-sensor-state" ); +int rc; + +if (token ==RTAS_UNKNOWN_SERVICE ) +return -ENOENT ; + + rc =rtas_call (token,2 ,2 , state, sensor, index); +WARN_ON (rc ==RTAS_BUSY || (rc >=RTAS_EXTENDED_DELAY_MIN && + rc <=RTAS_EXTENDED_DELAY_MAX )); + +if (rc <0 ) +return rtas_error_rc (rc); +return rc; +} +bool rtas_indicator_present (int token,int *maxindex) {int proplen, count, i;
arch/powerpc/mm/hugepage-hash64.c +2 -1
@@ -136,7 +136,6 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,BUG_ON (index >=4096 ); vpn =hpt_vpn (ea, vsid, ssize); - hash =hpt_hash (vpn, shift, ssize); hpte_slot_array =get_hpte_slot_array (pmdp);if (psize ==MMU_PAGE_4K ) {/*
@@ -151,6 +150,7 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid, valid =hpte_valid (hpte_slot_array, index);if (valid) {/* update the hpte bits */ + hash =hpt_hash (vpn, shift, ssize); hidx =hpte_hash_index (hpte_slot_array, index);if (hidx & _PTEIDX_SECONDARY) hash = ~hash;
@@ -176,6 +176,7 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,if (!valid) {unsigned long hpte_group; + hash =hpt_hash (vpn, shift, ssize);/* insert new entry */ pa =pmd_pfn (__pmd (old_pmd)) <<PAGE_SHIFT ; new_pmd |= _PAGE_HASHPTE;
arch/powerpc/platforms/pseries/ras.c +2 -1
@@ -187,7 +187,8 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id)int state;int critical; - status =rtas_get_sensor (EPOW_SENSOR_TOKEN ,EPOW_SENSOR_INDEX , &state); + status =rtas_get_sensor_fast (EPOW_SENSOR_TOKEN ,EPOW_SENSOR_INDEX , + &state);if (state >3 ) critical =1 ;/* Time Critical */
arch/x86/kernel/entry_64.S +197 -99
388 lines not on this page · raw message
arch/x86/kernel/nmi.c +52 -71
161 lines not on this page · raw message
arch/x86/mm/init_32.c +1 -0
@@ -137,6 +137,7 @@ page_table_range_init_count(unsigned long start, unsigned long end) vaddr = start; pgd_idx =pgd_index (vaddr); + pmd_idx =pmd_index (vaddr);for ( ; (pgd_idx <PTRS_PER_PGD ) && (vaddr != end); pgd_idx++) { for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
block/blk-mq-sysfs.c +18 -7
@@ -141,15 +141,26 @@ static ssize_t blk_mq_sysfs_completed_show(struct blk_mq_ctx *ctx, char *page)static ssize_t sysfs_list_show (char *page,struct list_head *list,char *msg) { -char *start_page = page;struct request *rq; +int len =snprintf (page,PAGE_SIZE -1 ,"%s:\n" , msg); + +list_for_each_entry (rq, list, queuelist) { +const int rq_len =2 *sizeof (rq) +2 ; + +/* if the output will be truncated */ +if (PAGE_SIZE -1 < len + rq_len) { +/* backspacing if it can't hold '\t...\n' */ +if (PAGE_SIZE -1 < len +5 ) + len -= rq_len; + len +=snprintf (page + len,PAGE_SIZE -1 - len, +"\t...\n" ); +break ; + } + len +=snprintf (page + len,PAGE_SIZE -1 - len, +"\t%p\n" , rq); + } - page +=sprintf (page,"%s:\n" , msg); - -list_for_each_entry (rq, list, queuelist) - page +=sprintf (page,"\t%p\n" , rq); - -return page - start_page; +return len; }static ssize_t blk_mq_sysfs_rq_list_show (struct blk_mq_ctx *ctx,char *page)
drivers/base/node.c +10 -0
@@ -399,6 +399,16 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid)for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {int page_nid; +/* +* memory block could have several absent sections from start. +* skip pfn range from absent section +*/ +if (!pfn_present (pfn)) { + pfn =round_down (pfn +PAGES_PER_SECTION , +PAGES_PER_SECTION ) -1 ; +continue ; + } + page_nid =get_nid_for_pfn (pfn);if (page_nid <0 )continue ;
drivers/block/nvme-core.c +1 -1
@@ -2464,6 +2464,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (result) goto release; +kref_init (&dev->kref); result =nvme_dev_start (dev);if (result) {if (result == -EBUSY )
@@ -2471,7 +2472,6 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto release_pools; } -kref_init (&dev->kref); result =nvme_dev_add (dev);if (result) goto shutdown;
drivers/gpu/drm/radeon/radeon_combios.c +8 -0
@@ -3387,6 +3387,14 @@ void radeon_combios_asic_init(struct drm_device *dev) rdev->pdev->subsystem_device == 0x30ae)return ; +/* quirk for rs4xx HP Compaq dc5750 Small Form Factor to make it resume +* - it hangs on resume inside the dynclk 1 table. +*/ +if (rdev->family ==CHIP_RS480 && + rdev->pdev->subsystem_vendor ==0x103c && + rdev->pdev->subsystem_device ==0x280a ) +return ; +/* DYN CLK 1 */ table =combios_get_table_offset (dev,COMBIOS_DYN_CLK_1_TABLE );if (table)
drivers/iio/gyro/Kconfig +1 -2
@@ -93,8 +93,7 @@ config IIO_ST_GYRO_SPI_3AXIS config ITG3200 tristate "InvenSense ITG3200 Digital 3-Axis Gyroscope I2C driver" depends on I2C - select IIO_BUFFER - select IIO_TRIGGERED_BUFFER + select IIO_TRIGGERED_BUFFER if IIO_BUFFER help Say yes here to add support for the InvenSense ITG3200 digital 3-axis gyroscope sensor.
drivers/infiniband/core/uverbs.h +2 -1
@@ -85,7 +85,7 @@*/ struct ib_uverbs_device { -struct kref ref; +atomic_t refcount;int num_comp_vectors;struct completion comp;struct device *dev;
@@ -94,6 +94,7 @@ struct ib_uverbs_device {struct cdev cdev;struct rb_root xrcd_tree;struct mutex xrcd_tree_mutex; +struct kobject kobj; };struct ib_uverbs_event_file {
drivers/infiniband/core/uverbs_cmd.c +9 -1
@@ -2111,6 +2111,12 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, next->send_flags = user_wr->send_flags;if (is_ud) { +if (next->opcode !=IB_WR_SEND && + next->opcode !=IB_WR_SEND_WITH_IMM ) { + ret = -EINVAL ; + goto out_put; + } + next->wr.ud.ah =idr_read_ah (user_wr->wr.ud.ah, file->ucontext);if (!next->wr.ud.ah) {
@@ -2150,9 +2156,11 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, user_wr->wr.atomic.compare_add; next->wr.atomic.swap = user_wr->wr.atomic.swap; next->wr.atomic.rkey = user_wr->wr.atomic.rkey; +case IB_WR_SEND :break ;default : -break ; + ret = -EINVAL ; + goto out_put; } }
drivers/infiniband/core/uverbs_main.c +30 -13
125 lines not on this page · raw message
drivers/infiniband/hw/mlx4/ah.c +5 -1
@@ -147,9 +147,13 @@ int mlx4_ib_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr)enum rdma_link_layer ll;memset (ah_attr,0 ,sizeof *ah_attr); - ah_attr->sl =be32_to_cpu (ah->av.ib.sl_tclass_flowlabel) >>28 ; ah_attr->port_num =be32_to_cpu (ah->av.ib.port_pd) >>24 ; ll =rdma_port_get_link_layer (ibah->device, ah_attr->port_num); +if (ll ==IB_LINK_LAYER_ETHERNET ) + ah_attr->sl =be32_to_cpu (ah->av.eth.sl_tclass_flowlabel) >>29 ; +else + ah_attr->sl =be32_to_cpu (ah->av.ib.sl_tclass_flowlabel) >>28 ; + ah_attr->dlid = ll ==IB_LINK_LAYER_INFINIBAND ?be16_to_cpu (ah->av.ib.dlid) :0 ;if (ah->av.ib.stat_rate) ah_attr->static_rate = ah->av.ib.stat_rate -MLX4_STAT_RATE_OFFSET ;
drivers/infiniband/hw/mlx4/sysfs.c +4 -1
@@ -563,6 +563,8 @@ static int add_port(struct mlx4_ib_dev *dev, int port_num, int slave)struct mlx4_port *p;int i;int ret; +int is_eth =rdma_port_get_link_layer (&dev->ib_dev, port_num) == +IB_LINK_LAYER_ETHERNET ; p =kzalloc (sizeof *p,GFP_KERNEL );if (!p)
@@ -580,7 +582,8 @@ static int add_port(struct mlx4_ib_dev *dev, int port_num, int slave) p->pkey_group.name ="pkey_idx" ; p->pkey_group.attrs = -alloc_group_attrs (show_port_pkey, store_port_pkey, +alloc_group_attrs (show_port_pkey, + is_eth ?NULL : store_port_pkey, dev->dev->caps.pkey_table_len[port_num]);if (!p->pkey_group.attrs) { ret = -ENOMEM ;
drivers/infiniband/hw/qib/qib_keys.c +4 -0
@@ -86,6 +86,10 @@ int qib_alloc_lkey(struct qib_mregion *mr, int dma_region)* unrestricted LKEY. */ rkt->gen++; +/* +* bits are capped in qib_verbs.c to insure enough bits +* for generation number +*/ mr->lkey = (r << (32 - ib_qib_lkey_table_size)) | ((((1 << (24 - ib_qib_lkey_table_size)) -1 ) & rkt->gen) <<8 );
drivers/infiniband/hw/qib/qib_verbs.c +10 -4
@@ -40,6 +40,7 @@#include <linux/rculist.h> #include <linux/mm.h> #include <linux/random.h> +#include <linux/vmalloc.h> #include "qib.h" #include "qib_common.h"
@@ -2086,10 +2087,16 @@ int qib_register_ib_device(struct qib_devdata *dd)* the LKEY). The remaining bits act as a generation number or tag. */ spin_lock_init (&dev->lk_table.lock); +/* insure generation is at least 4 bits see keys.c */ +if (ib_qib_lkey_table_size >MAX_LKEY_TABLE_BITS ) { +qib_dev_warn (dd,"lkey bits %u too large, reduced to %u\n" , + ib_qib_lkey_table_size,MAX_LKEY_TABLE_BITS ); + ib_qib_lkey_table_size =MAX_LKEY_TABLE_BITS ; + } dev->lk_table.max =1 << ib_qib_lkey_table_size; lk_tab_size = dev->lk_table.max *sizeof (*dev->lk_table.table); dev->lk_table.table = (struct qib_mregion __rcu **) -__get_free_pages (GFP_KERNEL ,get_order (lk_tab_size)); +vmalloc (lk_tab_size);if (dev->lk_table.table ==NULL ) { ret = -ENOMEM ; goto err_lk;
@@ -2262,7 +2269,7 @@ err_tx:sizeof (struct qib_pio_header ), dev->pio_hdrs, dev->pio_hdrs_phys); err_hdrs: -free_pages ((unsigned long ) dev->lk_table.table,get_order (lk_tab_size)); +vfree (dev->lk_table.table); err_lk:kfree (dev->qp_table); err_qpt:
@@ -2316,8 +2323,7 @@ void qib_unregister_ib_device(struct qib_devdata *dd)sizeof (struct qib_pio_header ), dev->pio_hdrs, dev->pio_hdrs_phys); lk_tab_size = dev->lk_table.max *sizeof (*dev->lk_table.table); -free_pages ((unsigned long ) dev->lk_table.table, -get_order (lk_tab_size)); +vfree (dev->lk_table.table);kfree (dev->qp_table); }
drivers/infiniband/hw/qib/qib_verbs.h +2 -0
@@ -647,6 +647,8 @@ struct qib_qpn_table {struct qpn_map map[QPNMAP_ENTRIES ]; }; +#define MAX_LKEY_TABLE_BITS 23 +struct qib_lkey_table {spinlock_t lock;/* protect changes in this struct */ u32 next;/* next unused index (speeds search) */
drivers/input/evdev.c +4 -9
@@ -240,19 +240,14 @@ static int evdev_flush(struct file *file, fl_owner_t id) {struct evdev_client *client = file->private_data;struct evdev *evdev = client->evdev; -int retval; - retval =mutex_lock_interruptible (&evdev->mutex); -if (retval) -return retval; +mutex_lock (&evdev->mutex); -if (!evdev->exist || client->revoked) - retval = -ENODEV ; -else - retval =input_flush_device (&evdev->handle, file); +if (evdev->exist && !client->revoked) +input_flush_device (&evdev->handle, file);mutex_unlock (&evdev->mutex); -return retval; +return 0 ; }static void evdev_free (struct device *dev)
drivers/isdn/gigaset/ser-gigaset.c +10 -1
@@ -524,9 +524,18 @@ gigaset_tty_open(struct tty_struct *tty) cs->hw.ser->tty = tty;atomic_set (&cs->hw.ser->refcnt,1 );init_completion (&cs->hw.ser->dead_cmp); - tty->disc_data = cs; +/* Set the amount of data we're willing to receive per call +* from the hardware driver to half of the input buffer size +* to leave some reserve. +* Note: We don't do flow control towards the hardware driver. +* If more data is received than will fit into the input buffer, +* it will be dropped and an error will be logged. This should +* never happen as the device is slow and the buffer size ample. +*/ + tty->receive_room =RBUFSIZE /2 ; +/* OK.. Initialization of the datastructures and the HW is done.. Now * startup system and notify the LL that we are ready to run */
drivers/md/raid10.c +4 -1
@@ -3585,6 +3585,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)/* far_copies must be 1 */ conf->prev.stride = conf->dev_sectors; } + conf->reshape_safe = conf->reshape_progress;spin_lock_init (&conf->device_lock);INIT_LIST_HEAD (&conf->retry_list);
@@ -3793,7 +3794,6 @@ static int run(struct mddev *mddev) } conf->offset_diff = min_offset_diff; - conf->reshape_safe = conf->reshape_progress;clear_bit (MD_RECOVERY_SYNC , &mddev->recovery);clear_bit (MD_RECOVERY_CHECK , &mddev->recovery);set_bit (MD_RECOVERY_RESHAPE , &mddev->recovery);
@@ -4138,6 +4138,7 @@ static int raid10_start_reshape(struct mddev *mddev) conf->reshape_progress = size; }else conf->reshape_progress =0 ; + conf->reshape_safe = conf->reshape_progress;spin_unlock_irq (&conf->device_lock);if (mddev->delta_disks && mddev->bitmap) {
@@ -4204,6 +4205,7 @@ abort: rdev->new_data_offset = rdev->data_offset;smp_wmb (); conf->reshape_progress = MaxSector; + conf->reshape_safe = MaxSector; mddev->reshape_position = MaxSector;spin_unlock_irq (&conf->device_lock);return ret;
@@ -4556,6 +4558,7 @@ static void end_reshape(struct r10conf *conf)md_finish_reshape (conf->mddev);smp_wmb (); conf->reshape_progress = MaxSector; + conf->reshape_safe = MaxSector;spin_unlock_irq (&conf->device_lock);/* read-ahead size must cover two whole stripes, which is
drivers/media/platform/omap3isp/isp.c +2 -2
@@ -824,14 +824,14 @@ static int isp_pipeline_link_notify(struct media_link *link, u32 flags,int ret;if (notification ==MEDIA_DEV_NOTIFY_POST_LINK_CH && - !(link->flags &MEDIA_LNK_FL_ENABLED )) { + !(flags &MEDIA_LNK_FL_ENABLED )) {/* Powering off entities is assumed to never fail. */ isp_pipeline_pm_power (source, -sink_use);isp_pipeline_pm_power (sink, -source_use);return 0 ; } -if (notification ==MEDIA_DEV_NOTIFY_POST_LINK_CH && +if (notification ==MEDIA_DEV_NOTIFY_PRE_LINK_CH && (flags &MEDIA_LNK_FL_ENABLED )) { ret =isp_pipeline_pm_power (source, sink_use);
drivers/media/rc/rc-main.c +0 -3
@@ -982,9 +982,6 @@ static int rc_dev_uevent(struct device *device, struct kobj_uevent_env *env) {struct rc_dev *dev =to_rc_dev (device); -if (!dev || !dev->input_dev) -return -ENODEV ; -if (dev->rc_map.name)ADD_HOTPLUG_VAR ("NAME=%s" , dev->rc_map.name);if (dev->driver_name)
drivers/mmc/core/core.c +4 -2
@@ -329,8 +329,10 @@ EXPORT_SYMBOL(mmc_start_bkops);*/ static void mmc_wait_data_done (struct mmc_request *mrq) { - mrq->host->context_info.is_done_rcv = true; -wake_up_interruptible (&mrq->host->context_info.wait); +struct mmc_context_info *context_info = &mrq->host->context_info; + + context_info->is_done_rcv = true; +wake_up_interruptible (&context_info->wait); }static void mmc_wait_done (struct mmc_request *mrq)
drivers/net/bonding/bond_main.c +21 -0
@@ -636,6 +636,23 @@ static void bond_set_dev_addr(struct net_device *bond_dev,call_netdevice_notifiers (NETDEV_CHANGEADDR , bond_dev); } +static struct slave *bond_get_old_active (struct bonding *bond, +struct slave *new_active) +{ +struct slave *slave; +struct list_head *iter; + +bond_for_each_slave (bond, slave, iter) { +if (slave == new_active) +continue ; + +if (ether_addr_equal (bond->dev->dev_addr, slave->dev->dev_addr)) +return slave; + } + +return NULL ; +} +/* * bond_do_fail_over_mac *
@@ -672,6 +689,9 @@ static void bond_do_fail_over_mac(struct bonding *bond,write_unlock_bh (&bond->curr_slave_lock); +if (!old_active) + old_active =bond_get_old_active (bond, new_active); +if (old_active) {memcpy (tmp_mac, new_active->dev->dev_addr,ETH_ALEN ); memcpy(saddr.sa_data, old_active->dev->dev_addr,
@@ -1825,6 +1845,7 @@ static int bond_release_and_destroy(struct net_device *bond_dev, bond_dev->priv_flags |=IFF_DISABLE_NETPOLL ;pr_info ("%s: destroying bond %s.\n" , bond_dev->name, bond_dev->name); +bond_remove_proc_entry (bond);unregister_netdevice (bond_dev); }return ret;
drivers/net/ethernet/broadcom/tg3.c +1 -1
@@ -10737,7 +10737,7 @@ static ssize_t tg3_show_temp(struct device *dev,tg3_ape_scratchpad_read (tp, &temperature, attr->index,sizeof (temperature));spin_unlock_bh (&tp->lock); -return sprintf (buf,"%u\n" , temperature); +return sprintf (buf,"%u\n" , temperature *1000 ); }
drivers/net/ethernet/brocade/bna/bnad.c +1 -1
@@ -674,6 +674,7 @@ bnad_cq_process(struct bnad *bnad, struct bna_ccb *ccb, int budget)if (!next_cmpl->valid)break ; } + packets++;/* TODO: BNA_CQ_EF_LOCAL ? */ if (unlikely(flags & (BNA_CQ_EF_MAC_ERROR |
@@ -690,7 +691,6 @@ bnad_cq_process(struct bnad *bnad, struct bna_ccb *ccb, int budget)else bnad_cq_setup_skb_frags (rcb, skb, sop_ci, nvecs, len); - packets++; rcb->rxq->rx_packets++; rcb->rxq->rx_bytes += totlen; ccb->bytes_per_intr += totlen;
drivers/net/ethernet/mellanox/mlx4/eq.c +2 -2
@@ -557,7 +557,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)mlx4_dbg (dev,"%s: Sending MLX4_PORT_CHANGE_SUBTYPE_DOWN" " to slave: %d, port:%d\n" , __func__, i, port); - s_info = &priv->mfunc.master.vf_oper[slave].vport[port].state; + s_info = &priv->mfunc.master.vf_oper[i].vport[port].state;if (IFLA_VF_LINK_STATE_AUTO == s_info->link_state)mlx4_slave_event (dev, i, eqe); }else {/* IB port */
@@ -583,7 +583,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)for (i =0 ; i < dev->num_slaves; i++) {if (i ==mlx4_master_func_num (dev))continue ; - s_info = &priv->mfunc.master.vf_oper[slave].vport[port].state; + s_info = &priv->mfunc.master.vf_oper[i].vport[port].state;if (IFLA_VF_LINK_STATE_AUTO == s_info->link_state)mlx4_slave_event (dev, i, eqe); }
drivers/net/ethernet/stmicro/stmmac/descs.h +2 -0
@@ -158,6 +158,8 @@ struct dma_desc { u32 buffer2_size:13; u32 reserved4:3; } etx;/* -- enhanced -- */ + +u64 all_flags; } des01;unsigned int des2;unsigned int des3;
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +2 -1
@@ -240,6 +240,7 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,static void enh_desc_init_rx_desc (struct dma_desc *p,int disable_rx_ic,int mode,int end) { + p->des01.all_flags =0 ; p->des01.erx.own =1 ; p->des01.erx.buffer1_size = BUF_SIZE_8KiB -1 ;
@@ -254,7 +255,7 @@ static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,static void enh_desc_init_tx_desc (struct dma_desc *p,int mode,int end) { - p->des01.etx.own =0 ; + p->des01.all_flags =0 ;if (mode ==STMMAC_CHAIN_MODE )ehn_desc_tx_set_on_chain (p, end);else
drivers/net/ethernet/stmicro/stmmac/norm_desc.c +2 -1
@@ -123,6 +123,7 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,static void ndesc_init_rx_desc (struct dma_desc *p,int disable_rx_ic,int mode,int end) { + p->des01.all_flags =0 ; p->des01.rx.own =1 ; p->des01.rx.buffer1_size = BUF_SIZE_2KiB -1 ;
@@ -137,7 +138,7 @@ static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,static void ndesc_init_tx_desc (struct dma_desc *p,int mode,int end) { - p->des01.tx.own =0 ; + p->des01.all_flags =0 ;if (mode ==STMMAC_CHAIN_MODE )ndesc_tx_set_on_chain (p, end);else
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +22 -22
63 lines not on this page · raw message
drivers/net/usb/usbnet.c +4 -3
@@ -778,7 +778,7 @@ int usbnet_stop (struct net_device *net) {struct usbnet *dev =netdev_priv (net);struct driver_info *info = dev->driver_info; -int retval, pm; +int retval, pm, mpn;clear_bit (EVENT_DEV_OPEN , &dev->flags);netif_stop_queue (net);
@@ -809,6 +809,8 @@ int usbnet_stop (struct net_device *net)usbnet_purge_paused_rxq (dev); + mpn = !test_and_clear_bit (EVENT_NO_RUNTIME_PM , &dev->flags); +/* deferred work (task, timer, softirq) must also stop. * can't flush_scheduled_work() until we drop rtnl (later), * else workers could deadlock; so make workers a NOP.
@@ -819,8 +821,7 @@ int usbnet_stop (struct net_device *net)if (!pm)usb_autopm_put_interface (dev->intf); -if (info->manage_power && - !test_and_clear_bit (EVENT_NO_RUNTIME_PM , &dev->flags)) +if (info->manage_power && mpn) info->manage_power (dev,0 );else usb_autopm_put_interface (dev->intf);
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 -0
@@ -314,6 +314,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = { {RTL_USB_DEVICE(0x07b8, 0x8188, rtl92cu_hal_cfg)}, /*Abocom - Abocom*/ {RTL_USB_DEVICE(0x07b8, 0x8189, rtl92cu_hal_cfg)}, /*Funai - Abocom*/ {RTL_USB_DEVICE(0x0846, 0x9041, rtl92cu_hal_cfg)}, /*NetGear WNA1000M*/ + {RTL_USB_DEVICE(0x0846, 0x9043, rtl92cu_hal_cfg)}, /*NG WNA1000Mv2*/ {RTL_USB_DEVICE(0x0b05, 0x17ba, rtl92cu_hal_cfg)}, /*ASUS-Edimax*/ {RTL_USB_DEVICE(0x0bda, 0x5088, rtl92cu_hal_cfg)}, /*Thinkware-CC&C*/ {RTL_USB_DEVICE(0x0df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/
drivers/xen/gntdev.c +20 -20
@@ -67,7 +67,7 @@ struct gntdev_priv {* Only populated if populate_freeable_maps == 1 */ struct list_head freeable_maps;/* lock protects maps and freeable_maps */ -spinlock_t lock; +struct mutex lock;struct mm_struct *mm;struct mmu_notifier mn; };
@@ -216,9 +216,9 @@ static void gntdev_put_map(struct gntdev_priv *priv, struct grant_map *map) }if (populate_freeable_maps && priv) { -spin_lock (&priv->lock); +mutex_lock (&priv->lock);list_del (&map->next); -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock); }if (map->pages && !use_ptemod)
@@ -387,9 +387,9 @@ static void gntdev_vma_close(struct vm_area_struct *vma)* not do any unmapping, since that has been done prior to * closing the vma, but it may still iterate the unmap_ops list. */ -spin_lock (&priv->lock); +mutex_lock (&priv->lock); map->vma =NULL ; -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock); } vma->vm_private_data =NULL ;gntdev_put_map (priv, map);
@@ -433,14 +433,14 @@ static void mn_invl_range_start(struct mmu_notifier *mn, struct gntdev_priv *priv = container_of(mn, struct gntdev_priv, mn);struct grant_map *map; -spin_lock (&priv->lock); +mutex_lock (&priv->lock);list_for_each_entry (map, &priv->maps, next) {unmap_if_in_range (map, start, end); }list_for_each_entry (map, &priv->freeable_maps, next) {unmap_if_in_range (map, start, end); } -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock); } static void mn_invl_page(struct mmu_notifier *mn,
@@ -457,7 +457,7 @@ static void mn_release(struct mmu_notifier *mn,struct grant_map *map;int err; -spin_lock (&priv->lock); +mutex_lock (&priv->lock);list_for_each_entry (map, &priv->maps, next) {if (!map->vma)continue ;
@@ -476,7 +476,7 @@ static void mn_release(struct mmu_notifier *mn, err =unmap_grant_pages (map,/* offset */ 0 , map->count);WARN_ON (err); } -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock); }static struct mmu_notifier_ops gntdev_mmu_ops = {
@@ -498,7 +498,7 @@ static int gntdev_open(struct inode *inode, struct file *flip)INIT_LIST_HEAD (&priv->maps);INIT_LIST_HEAD (&priv->freeable_maps); -spin_lock_init (&priv->lock); +mutex_init (&priv->lock);if (use_ptemod) { priv->mm =get_task_mm (current);
@@ -574,10 +574,10 @@ static long gntdev_ioctl_map_grant_ref(struct gntdev_priv *priv,return -EFAULT ; } -spin_lock (&priv->lock); +mutex_lock (&priv->lock);gntdev_add_map (priv, map); op.index = map->index <<PAGE_SHIFT ; -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock);if (copy_to_user (u, &op,sizeof (op)) !=0 )return -EFAULT ;
@@ -596,7 +596,7 @@ static long gntdev_ioctl_unmap_grant_ref(struct gntdev_priv *priv,return -EFAULT ;pr_debug ("priv %p, del %d+%d\n" , priv, (int )op.index, (int )op.count); -spin_lock (&priv->lock); +mutex_lock (&priv->lock); map =gntdev_find_map_index (priv, op.index >>PAGE_SHIFT , op.count);if (map) {list_del (&map->next);
@@ -604,7 +604,7 @@ static long gntdev_ioctl_unmap_grant_ref(struct gntdev_priv *priv,list_add_tail (&map->next, &priv->freeable_maps); err =0 ; } -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock);if (map)gntdev_put_map (priv, map);return err;
@@ -672,7 +672,7 @@ static long gntdev_ioctl_notify(struct gntdev_priv *priv, void __user *u) out_flags = op.action; out_event = op.event_channel_port; -spin_lock (&priv->lock); +mutex_lock (&priv->lock);list_for_each_entry (map, &priv->maps, next) {uint64_t begin = map->index <<PAGE_SHIFT ;
@@ -700,7 +700,7 @@ static long gntdev_ioctl_notify(struct gntdev_priv *priv, void __user *u) rc =0 ; unlock_out: -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock);/* Drop the reference to the event channel we did not save in the map */ if (out_flags &UNMAP_NOTIFY_SEND_EVENT )
@@ -750,7 +750,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)pr_debug ("map %d+%d at %lx (pgoff %lx)\n" , index, count, vma->vm_start, vma->vm_pgoff); -spin_lock (&priv->lock); +mutex_lock (&priv->lock); map =gntdev_find_map_index (priv, index, count);if (!map) goto unlock_out;
@@ -785,7 +785,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) map->flags |= GNTMAP_readonly; } -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock);if (use_ptemod) { err = apply_to_page_range(vma->vm_mm, vma->vm_start,
@@ -813,11 +813,11 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)return 0 ; unlock_out: -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock);return err; out_unlock_put: -spin_unlock (&priv->lock); +mutex_unlock (&priv->lock); out_put_map:if (use_ptemod) map->vma =NULL ;
fs/btrfs/transaction.c +3 -0
@@ -1710,8 +1710,11 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,spin_unlock (&root->fs_info->trans_lock);wait_for_commit (root, prev_trans); + ret = prev_trans->aborted;btrfs_put_transaction (prev_trans); +if (ret) + goto cleanup_transaction; }else {spin_unlock (&root->fs_info->trans_lock); }
fs/cifs/ioctl.c +6 -0
@@ -67,6 +67,12 @@ static long cifs_ioctl_clone(unsigned int xid, struct file *dst_file, goto out_drop_write; } +if (src_file.file->f_op->unlocked_ioctl != cifs_ioctl) { + rc = -EBADF ; +cifs_dbg (VFS ,"src file seems to be from a different filesystem type\n" ); + goto out_fput; + } +if ((!src_file.file->private_data) || (!dst_file->private_data)) { rc = -EBADF ;cifs_dbg (VFS ,"missing cifsFileInfo on copy range src file\n" );
fs/coredump.c +32 -6
@@ -498,10 +498,10 @@ void do_coredump(const siginfo_t *siginfo)const struct cred *old_cred;struct cred *cred;int retval =0 ; -int flag =0 ;int ispipe;struct files_struct *displaced; -bool need_nonrelative = false; +/* require nonrelative corefile path and be extra careful */ +bool need_suid_safe = false;bool core_dumped = false;static atomic_t core_dump_count =ATOMIC_INIT (0 );struct coredump_params cprm = {
@@ -535,9 +535,8 @@ void do_coredump(const siginfo_t *siginfo)*/ if (__get_dumpable (cprm.mm_flags) ==SUID_DUMP_ROOT ) {/* Setuid core dump mode */ - flag =O_EXCL ;/* Stop rewrite attacks */ cred->fsuid =GLOBAL_ROOT_UID ;/* Dump root private */ - need_nonrelative = true; + need_suid_safe = true; } retval =coredump_wait (siginfo->si_signo, &core_state);
@@ -618,7 +617,7 @@ void do_coredump(const siginfo_t *siginfo)if (cprm.limit < binfmt->min_coredump) goto fail_unlock; -if (need_nonrelative && cn.corename[0 ] !='/' ) { +if (need_suid_safe && cn.corename[0 ] !='/' ) {printk (KERN_WARNING "Pid %d(%s) can only dump core " \"to fully qualified path!\n" ,task_tgid_vnr (current), current->comm);
@@ -626,8 +625,35 @@ void do_coredump(const siginfo_t *siginfo) goto fail_unlock; } +/* +* Unlink the file if it exists unless this is a SUID +* binary - in that case, we're running around with root +* privs and don't want to unlink another user's coredump. +*/ +if (!need_suid_safe) { +mm_segment_t old_fs; + + old_fs =get_fs (); +set_fs (KERNEL_DS ); +/* +* If it doesn't exist, that's fine. If there's some +* other problem, we'll catch it at the filp_open(). +*/ + (void )sys_unlink ((const char __user *)cn.corename); +set_fs (old_fs); + } + +/* +* There is a race between unlinking and creating the +* file, but if that causes an EEXIST here, that's +* fine - another process raced with us while creating +* the corefile, and the other process won. To userspace, +* what matters is that at least one of the two processes +* writes its coredump successfully, not which one. +*/ cprm.file =filp_open (cn.corename, -O_CREAT |2 |O_NOFOLLOW |O_LARGEFILE | flag, +O_CREAT |2 |O_NOFOLLOW | +O_LARGEFILE |O_EXCL ,0600 );if (IS_ERR (cprm.file)) goto fail_unlock;
fs/hfs/bnode.c +4 -5
@@ -288,7 +288,6 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)page_cache_release (page); goto fail; } -page_cache_release (page); node->page[i] = page; }
@@ -398,11 +397,11 @@ node_error:void hfs_bnode_free (struct hfs_bnode *node) { -//int i; +int i; -//for (i = 0; i < node->tree->pages_per_bnode; i++) -// if (node->page[i]) -// page_cache_release(node->page[i]); +for (i =0 ; i < node->tree->pages_per_bnode; i++) +if (node->page[i]) +page_cache_release (node->page[i]);kfree (node); }
fs/hfs/brec.c +11 -9
@@ -131,13 +131,16 @@ skip:hfs_bnode_write (node, entry, data_off + key_len, entry_len);hfs_bnode_dump (node); -if (new_node) { -/* update parent key if we inserted a key -* at the start of the first node -*/ -if (!rec && new_node != node) -hfs_brec_update_parent (fd); +/* +* update parent key if we inserted a key +* at the start of the node and it is not the new node +*/ +if (!rec && new_node != node) { +hfs_bnode_read_key (node, fd->search_key, data_off + size); +hfs_brec_update_parent (fd); + } +if (new_node) {hfs_bnode_put (fd->bnode);if (!new_node->parent) {hfs_btree_inc_height (tree);
@@ -166,9 +169,6 @@ skip: goto again; } -if (!rec) -hfs_brec_update_parent (fd); -return 0 ; }
@@ -366,6 +366,8 @@ again:if (IS_ERR (parent))return PTR_ERR (parent);__hfs_brec_find (parent, fd); +if (fd->record <0 ) +return -ENOENT ;hfs_bnode_dump (parent); rec = fd->record;
fs/hfsplus/bnode.c +0 -3
@@ -456,7 +456,6 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)page_cache_release (page); goto fail; } -page_cache_release (page); node->page[i] = page; }
@@ -568,13 +567,11 @@ node_error:void hfs_bnode_free (struct hfs_bnode *node) { -#if 0 int i;for (i =0 ; i < node->tree->pages_per_bnode; i++)if (node->page[i])page_cache_release (node->page[i]); -#endif kfree (node); }
fs/nfs/nfs4proc.c +2 -1
@@ -2275,7 +2275,7 @@ static int _nfs4_do_open(struct inode *dir, goto err_free_label; state = ctx->state; -if ((opendata->o_arg.open_flags &O_EXCL ) && +if ((opendata->o_arg.open_flags & (O_CREAT |O_EXCL )) == (O_CREAT |O_EXCL ) && (opendata->o_arg.createmode !=NFS4_CREATE_GUARDED )) {nfs4_exclusive_attrset (opendata, sattr);
@@ -8368,6 +8368,7 @@ static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = { .reboot_recovery_ops = &nfs41_reboot_recovery_ops, .nograce_recovery_ops = &nfs41_nograce_recovery_ops, .state_renewal_ops = &nfs41_state_renewal_ops, + .mig_recovery_ops = &nfs41_mig_recovery_ops, };#endif
fs/nfs/pagelist.c +2 -2
@@ -60,8 +60,8 @@ EXPORT_SYMBOL_GPL(nfs_pgheader_init);void nfs_set_pgio_error (struct nfs_pgio_header *hdr,int error,loff_t pos) {spin_lock (&hdr->lock); -if (pos < hdr->io_start + hdr->good_bytes) { -set_bit (NFS_IOHDR_ERROR , &hdr->flags); +if (!test_and_set_bit (NFS_IOHDR_ERROR , &hdr->flags) + || pos < hdr->io_start + hdr->good_bytes) {clear_bit (NFS_IOHDR_EOF , &hdr->flags); hdr->good_bytes = pos - hdr->io_start; hdr->error = error;
fs/udf/inode.c +16 -0
@@ -1496,6 +1496,22 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) iinfo->i_checkpoint =le32_to_cpu (efe->checkpoint); } +/* +* Sanity check length of allocation descriptors and extended attrs to +* avoid integer overflows +*/ +if (iinfo->i_lenEAttr > inode->i_sb->s_blocksize + || iinfo->i_lenAlloc > inode->i_sb->s_blocksize) { +make_bad_inode (inode); +return ; + } +/* Now do exact checks */ +if (udf_file_entry_alloc_offset (inode) + + iinfo->i_lenAlloc > inode->i_sb->s_blocksize) { +make_bad_inode (inode); +return ; + } +switch (fe->icbTag.fileType) {case ICBTAG_FILE_TYPE_DIRECTORY : inode->i_op = &udf_dir_inode_operations;
include/net/ip.h +1 -0
@@ -154,6 +154,7 @@ static inline __u8 get_rtconn_flags(struct ipcm_cookie* ipc, struct sock* sk) }/* datagram.c */ +int __ip4_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len);int ip4_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len);void ip4_datagram_release_cb (struct sock *sk);
kernel/fork.c +18 -10
@@ -1756,13 +1756,21 @@ static int check_unshare_flags(unsigned long unshare_flags) CLONE_NEWUSER|CLONE_NEWPID))return -EINVAL ;/* -* Not implemented, but pretend it works if there is nothing to -* unshare. Note that unsharing CLONE_THREAD or CLONE_SIGHAND -* needs to unshare vm. +* Not implemented, but pretend it works if there is nothing +* to unshare. Note that unsharing the address space or the +* signal handlers also need to unshare the signal queues (aka +* CLONE_THREAD). */ if (unshare_flags & (CLONE_THREAD |CLONE_SIGHAND |CLONE_VM )) { -/* FIXME: get_task_mm() increments ->mm_users */ -if (atomic_read (¤t->mm->mm_users) >1 ) +if (!thread_group_empty (current)) +return -EINVAL ; + } +if (unshare_flags & (CLONE_SIGHAND |CLONE_VM )) { +if (atomic_read (¤t->sighand->count) >1 ) +return -EINVAL ; + } +if (unshare_flags &CLONE_VM ) { +if (!current_is_single_threaded ())return -EINVAL ; }
@@ -1831,16 +1839,16 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)if (unshare_flags &CLONE_NEWUSER ) unshare_flags |=CLONE_THREAD |CLONE_FS ;/* -* If unsharing a thread from a thread group, must also unshare vm. -*/ -if (unshare_flags &CLONE_THREAD ) - unshare_flags |=CLONE_VM ; -/* * If unsharing vm, must also unshare signal handlers. */ if (unshare_flags &CLONE_VM ) unshare_flags |=CLONE_SIGHAND ;/* +* If unsharing a signal handlers, must also unshare the signal queues. +*/ +if (unshare_flags &CLONE_SIGHAND ) + unshare_flags |=CLONE_THREAD ; +/* * If unsharing namespace, must also unshare filesystem information. */ if (unshare_flags &CLONE_NEWNS )
mm/vmscan.c +1 -1
@@ -1087,7 +1087,7 @@ cull_mlocked:if (PageSwapCache (page))try_to_free_swap (page);unlock_page (page); -putback_lru_page (page); +list_add (&page->lru, &ret_pages);continue ; activate_locked:
net/bridge/br_mdb.c +2 -1
@@ -347,7 +347,6 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,return -ENOMEM ;rcu_assign_pointer (*pp, p); -br_mdb_notify (br->dev, port, group,RTM_NEWMDB );return 0 ; }
@@ -370,6 +369,7 @@ static int __br_mdb_add(struct net *net, struct net_bridge *br,if (!p || p->br != br || p->state ==BR_STATE_DISABLED )return -EINVAL ; +memset (&ip,0 ,sizeof (ip)); ip.proto = entry->addr.proto;if (ip.proto ==htons (ETH_P_IP )) ip.u.ip4 = entry->addr.u.ip4;
@@ -416,6 +416,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry)if (!netif_running (br->dev) || br->multicast_disabled)return -EINVAL ; +memset (&ip,0 ,sizeof (ip)); ip.proto = entry->addr.proto;if (ip.proto ==htons (ETH_P_IP )) {if (timer_pending (&br->ip4_querier.timer))
net/core/datagram.c +41 -4
82 lines not on this page · raw message
net/core/dev.c +20 -18
@@ -3214,6 +3214,8 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,local_irq_save (flags);rps_lock (sd); +if (!netif_running (skb->dev)) + goto drop; qlen =skb_queue_len (&sd->input_pkt_queue);if (qlen <= netdev_max_backlog && !skb_flow_limit (skb, qlen)) {if (skb_queue_len (&sd->input_pkt_queue)) {
@@ -3235,6 +3237,7 @@ enqueue: goto enqueue; } +drop: sd->dropped++;rps_unlock (sd);
@@ -3551,8 +3554,6 @@ static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc) pt_prev =NULL ; -rcu_read_lock (); - another_round: skb->skb_iif = skb->dev->ifindex;
@@ -3562,7 +3563,7 @@ another_round: skb->protocol == cpu_to_be16(ETH_P_8021AD)) { skb =skb_vlan_untag (skb);if (unlikely (!skb)) - goto unlock; + goto out; }#ifdef CONFIG_NET_CLS_ACT
@@ -3587,7 +3588,7 @@ skip_taps:#ifdef CONFIG_NET_CLS_ACT skb =handle_ing (skb, &pt_prev, &ret, orig_dev);if (!skb) - goto unlock; + goto out; ncls:#endif
@@ -3602,7 +3603,7 @@ ncls:if (vlan_do_receive (&skb)) goto another_round;else if (unlikely (!skb)) - goto unlock; + goto out; } rx_handler =rcu_dereference (skb->dev->rx_handler);
@@ -3614,7 +3615,7 @@ ncls:switch (rx_handler (&skb)) {case RX_HANDLER_CONSUMED : ret =NET_RX_SUCCESS ; - goto unlock; + goto out;case RX_HANDLER_ANOTHER : goto another_round;case RX_HANDLER_EXACT :
@@ -3666,8 +3667,6 @@ drop: ret =NET_RX_DROP ; } -unlock: -rcu_read_unlock (); out:return ret; }
@@ -3699,29 +3698,30 @@ static int __netif_receive_skb(struct sk_buff *skb)static int netif_receive_skb_internal (struct sk_buff *skb) { +int ret; +net_timestamp_check (netdev_tstamp_prequeue, skb);if (skb_defer_rx_timestamp (skb))return NET_RX_SUCCESS ; +rcu_read_lock (); +#ifdef CONFIG_RPS if (static_key_false (&rps_needed)) {struct rps_dev_flow voidflow, *rflow = &voidflow; -int cpu, ret; - -rcu_read_lock (); - - cpu =get_rps_cpu (skb->dev, skb, &rflow); +int cpu =get_rps_cpu (skb->dev, skb, &rflow);if (cpu >=0 ) { ret =enqueue_to_backlog (skb, cpu, &rflow->last_qtail);rcu_read_unlock ();return ret; } -rcu_read_unlock (); }#endif -return __netif_receive_skb (skb); + ret =__netif_receive_skb (skb); +rcu_read_unlock (); +return ret; }/**
@@ -4182,8 +4182,10 @@ static int process_backlog(struct napi_struct *napi, int quota)unsigned int qlen;while ((skb =__skb_dequeue (&sd->process_queue))) { +rcu_read_lock ();local_irq_enable ();__netif_receive_skb (skb); +rcu_read_unlock ();local_irq_disable ();input_queue_head_incr (sd);if (++work >= quota) {
@@ -5694,6 +5696,7 @@ static void rollback_registered_many(struct list_head *head)unlist_netdevice (dev); dev->reg_state =NETREG_UNREGISTERING ; +on_each_cpu (flush_backlog, dev,1 ); }synchronize_net ();
@@ -5951,7 +5954,8 @@ static int netif_alloc_netdev_queues(struct net_device *dev)struct netdev_queue *tx;size_t sz = count *sizeof (*tx); -BUG_ON (count <1 || count >0xffff ); +if (count <1 || count >0xffff ) +return -EINVAL ; tx =kzalloc (sz,GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);if (!tx) {
@@ -6309,8 +6313,6 @@ void netdev_run_todo(void) dev->reg_state =NETREG_UNREGISTERED ; -on_each_cpu (flush_backlog, dev,1 ); -netdev_wait_allrefs (dev);/* paranoia */
net/core/fib_rules.c +9 -5
@@ -621,15 +621,17 @@ static int dump_rules(struct sk_buff *skb, struct netlink_callback *cb, {int idx =0 ;struct fib_rule *rule; +int err =0 ;rcu_read_lock ();list_for_each_entry_rcu (rule, &ops->rules_list, list) {if (idx < cb->args[1 ]) goto skip; -if (fib_nl_fill_rule (skb, rule,NETLINK_CB (cb->skb).portid, - cb->nlh->nlmsg_seq,RTM_NEWRULE , -NLM_F_MULTI , ops) <0 ) + err =fib_nl_fill_rule (skb, rule,NETLINK_CB (cb->skb).portid, + cb->nlh->nlmsg_seq,RTM_NEWRULE , +NLM_F_MULTI , ops); +if (err)break ; skip: idx++;
@@ -638,7 +640,7 @@ skip: cb->args[1 ] = idx;rules_ops_put (ops); -return skb->len; +return err; }static int fib_nl_dumprule (struct sk_buff *skb,struct netlink_callback *cb)
@@ -654,7 +656,9 @@ static int fib_nl_dumprule(struct sk_buff *skb, struct netlink_callback *cb)if (ops ==NULL )return -EAFNOSUPPORT ; -return dump_rules (skb, cb, ops); +dump_rules (skb, cb, ops); + +return skb->len; }rcu_read_lock ();
net/core/pktgen.c +3 -1
@@ -3464,8 +3464,10 @@ static int pktgen_thread_worker(void *arg)pktgen_rem_thread (t);/* Wait for kthread_stop */ -while (!kthread_should_stop ()) { +for (;;) {set_current_state (TASK_INTERRUPTIBLE ); +if (kthread_should_stop ()) +break ;schedule (); }__set_current_state (TASK_RUNNING );
net/core/rtnetlink.c +65 -63
156 lines not on this page · raw message
net/ipv4/af_inet.c +1 -1
@@ -1291,7 +1291,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, encap =SKB_GSO_CB (skb)->encap_level >0 ;if (encap) - features = skb->dev->hw_enc_features &netif_skb_features (skb); + features &= skb->dev->hw_enc_features;SKB_GSO_CB (skb)->encap_level += ihl;skb_reset_transport_header (skb);
net/ipv4/datagram.c +12 -4
@@ -20,7 +20,7 @@#include <net/route.h> #include <net/tcp_states.h> -int ip4_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len) +int __ip4_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len) {struct inet_sock *inet =inet_sk (sk);struct sockaddr_in *usin = (struct sockaddr_in *) uaddr;
@@ -39,8 +39,6 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)sk_dst_reset (sk); -lock_sock (sk); - oif = sk->sk_bound_dev_if; saddr = inet->inet_saddr;if (ipv4_is_multicast (usin->sin_addr.s_addr)) {
@@ -81,9 +79,19 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)sk_dst_set (sk, &rt->dst); err =0 ; out: -release_sock (sk);return err; } +EXPORT_SYMBOL (__ip4_datagram_connect); + +int ip4_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len) +{ +int res; + +lock_sock (sk); + res =__ip4_datagram_connect (sk, uaddr, addr_len); +release_sock (sk); +return res; +}EXPORT_SYMBOL (ip4_datagram_connect);/* Because UDP xmit path can manipulate sk_dst_cache without holding
net/ipv4/gre_offload.c +1 -1
@@ -69,7 +69,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, skb->mac_len =skb_inner_network_offset (skb);/* segment inner packet. */ - enc_features = skb->dev->hw_enc_features &netif_skb_features (skb); + enc_features = skb->dev->hw_enc_features & features; segs =skb_mac_gso_segment (skb, enc_features);if (!segs ||IS_ERR (segs)) {skb_gso_error_unwind (skb, protocol, ghl, mac_offset, mac_len);
net/ipv4/ip_fragment.c +5 -2
@@ -357,7 +357,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb) ihl =ip_hdrlen (skb);/* Determine the position of this fragment. */ - end = offset + skb->len - ihl; + end = offset + skb->len -skb_network_offset (skb) - ihl; err = -EINVAL ;/* Is this the final fragment? */
@@ -387,7 +387,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb) goto err; err = -ENOMEM ; -if (pskb_pull (skb, ihl) ==NULL ) +if (!pskb_pull (skb,skb_network_offset (skb) + ihl)) goto err; err =pskb_trim_rcsum (skb, end - offset);
@@ -628,6 +628,9 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, iph->frag_off = qp->q.max_size ?htons (IP_DF ) :0 ; iph->tot_len =htons (len); iph->tos |= ecn; + +ip_send_check (iph); +IP_INC_STATS_BH (net,IPSTATS_MIB_REASMOKS ); qp->q.fragments =NULL ; qp->q.fragments_tail =NULL ;
net/ipv4/ip_tunnel.c +5 -3
@@ -484,7 +484,8 @@ drop:EXPORT_SYMBOL_GPL (ip_tunnel_rcv);static int tnl_update_pmtu (struct net_device *dev,struct sk_buff *skb, -struct rtable *rt,__be16 df) +struct rtable *rt,__be16 df, +const struct iphdr *inner_iph) {struct ip_tunnel *tunnel =netdev_priv (dev);int pkt_size = skb->len - tunnel->hlen - dev->hard_header_len;
@@ -501,7 +502,8 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb,if (skb->protocol ==htons (ETH_P_IP )) {if (!skb_is_gso (skb) && - (df &htons (IP_DF )) && mtu < pkt_size) { + (inner_iph->frag_off &htons (IP_DF )) && + mtu < pkt_size) {memset (IPCB (skb),0 ,sizeof (*IPCB (skb)));icmp_send (skb,ICMP_DEST_UNREACH ,ICMP_FRAG_NEEDED ,htonl (mtu));return -E2BIG ;
@@ -632,7 +634,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, goto tx_error; } -if (tnl_update_pmtu (dev, skb, rt, tnl_params->frag_off)) { +if (tnl_update_pmtu (dev, skb, rt, tnl_params->frag_off, inner_iph)) {ip_rt_put (rt); goto tx_error; }
net/ipv4/udp.c +11 -4
@@ -1957,12 +1957,19 @@ void udp_v4_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_edemux; - dst = sk->sk_rx_dst; + dst =ACCESS_ONCE (sk->sk_rx_dst);if (dst) dst =dst_check (dst,0 ); -if (dst) -skb_dst_set_noref (skb, dst); +if (dst) { +/* DST_NOCACHE can not be used without taking a reference */ +if (dst->flags &DST_NOCACHE ) { +if (likely (atomic_inc_not_zero (&dst->__refcnt))) +skb_dst_set (skb, dst); + }else { +skb_dst_set_noref (skb, dst); + } + } }int udp_rcv (struct sk_buff *skb)
@@ -2510,7 +2517,7 @@ struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, skb->protocol =htons (ETH_P_TEB );/* segment inner packet. */ - enc_features = skb->dev->hw_enc_features &netif_skb_features (skb); + enc_features = skb->dev->hw_enc_features & features; segs =skb_mac_gso_segment (skb, enc_features);if (!segs ||IS_ERR (segs)) { skb_gso_error_unwind(skb, protocol, tnl_hlen, mac_offset,
net/ipv6/datagram.c +15 -5
@@ -40,7 +40,7 @@ static bool ipv6_mapped_addr_any(const struct in6_addr *a)return ipv6_addr_v4mapped (a) && (a->s6_addr32[3 ] ==0 ); } -int ip6_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len) +static int __ip6_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len) {struct sockaddr_in6 *usin = (struct sockaddr_in6 *) uaddr;struct inet_sock *inet =inet_sk (sk);
@@ -56,7 +56,7 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)if (usin->sin6_family ==AF_INET ) {if (__ipv6_only_sock (sk))return -EAFNOSUPPORT ; - err =ip4_datagram_connect (sk, uaddr, addr_len); + err =__ip4_datagram_connect (sk, uaddr, addr_len); goto ipv4_connected; }
@@ -98,9 +98,9 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) sin.sin_addr.s_addr = daddr->s6_addr32[3 ]; sin.sin_port = usin->sin6_port; - err =ip4_datagram_connect (sk, - (struct sockaddr *) &sin, -sizeof (sin)); + err =__ip4_datagram_connect (sk, + (struct sockaddr *) &sin, +sizeof (sin)); ipv4_connected:if (err)
@@ -203,6 +203,16 @@ out:fl6_sock_release (flowlabel);return err; } + +int ip6_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len) +{ +int res; + +lock_sock (sk); + res =__ip6_datagram_connect (sk, uaddr, addr_len); +release_sock (sk); +return res; +}EXPORT_SYMBOL_GPL (ip6_datagram_connect); int ip6_datagram_connect_v6_only(struct sock *sk, struct sockaddr *uaddr,
net/ipv6/exthdrs_offload.c +1 -1
@@ -36,6 +36,6 @@ out:return ret; out_rt: -inet_del_offload (&rthdr_offload,IPPROTO_ROUTING ); +inet6_del_offload (&rthdr_offload,IPPROTO_ROUTING ); goto out; }
net/ipv6/ip6_gre.c +1 -0
@@ -357,6 +357,7 @@ static void ip6gre_tunnel_uninit(struct net_device *dev)struct ip6gre_net *ign =net_generic (net, ip6gre_net_id);ip6gre_tunnel_unlink (ign,netdev_priv (dev)); +ip6_tnl_dst_reset (netdev_priv (dev));dev_put (dev); }
net/ipv6/ip6_input.c +3 -3
@@ -329,10 +329,10 @@ int ip6_mc_input(struct sk_buff *skb)if (offset <0 ) goto out; -if (!ipv6_is_mld (skb, nexthdr, offset)) - goto out; +if (ipv6_is_mld (skb, nexthdr, offset)) + deliver = true; - deliver = true; + goto out; }/* unknown RA - process it normally */ }
net/ipv6/ip6_offload.c +1 -1
@@ -112,7 +112,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, encap =SKB_GSO_CB (skb)->encap_level >0 ;if (encap) - features = skb->dev->hw_enc_features &netif_skb_features (skb); + features &= skb->dev->hw_enc_features;SKB_GSO_CB (skb)->encap_level +=sizeof (*ipv6h); ipv6h =ipv6_hdr (skb);
net/ipv6/ip6mr.c +1 -1
@@ -552,7 +552,7 @@ static void ipmr_mfc_seq_stop(struct seq_file *seq, void *v)if (it->cache == &mrt->mfc6_unres_queue)spin_unlock_bh (&mfc_unres_lock); -else if (it->cache == mrt->mfc6_cache_array) +else if (it->cache == &mrt->mfc6_cache_array[it->ct])read_unlock (&mrt_lock); }
net/mac80211/tx.c +0 -3
@@ -297,9 +297,6 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)if (tx->sdata->vif.type ==NL80211_IFTYPE_WDS )return TX_CONTINUE ; -if (tx->sdata->vif.type ==NL80211_IFTYPE_MESH_POINT ) -return TX_CONTINUE ; -if (tx->flags &IEEE80211_TX_PS_BUFFERED )return TX_CONTINUE ;
net/mpls/mpls_gso.c +1 -1
@@ -47,7 +47,7 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb,__skb_push (skb, skb->mac_len);/* Segment inner packet. */ - mpls_features = skb->dev->mpls_features &netif_skb_features (skb); + mpls_features = skb->dev->mpls_features & features; segs =skb_mac_gso_segment (skb, mpls_features);
net/netlink/af_netlink.c +70 -39
174 lines not on this page · raw message
net/netlink/af_netlink.h +9 -0
@@ -65,6 +65,15 @@ struct nl_portid_hash {u32 rnd; }; +static inline bool netlink_skb_is_mmaped (const struct sk_buff *skb) +{ +#ifdef CONFIG_NETLINK_MMAP +return NETLINK_CB (skb).flags &NETLINK_SKB_MMAPED ; +#else +return false; +#endif /* CONFIG_NETLINK_MMAP */ +} +struct netlink_table {struct nl_portid_hash hash;struct hlist_head mc_list;
net/openvswitch/datapath.c +1 -1
@@ -803,7 +803,7 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)if (IS_ERR (acts)) goto error; -ovs_flow_mask_key (&masked_key, &key, &mask); +ovs_flow_mask_key (&masked_key, &key, true, &mask); error =ovs_nla_copy_actions (a[OVS_FLOW_ATTR_ACTIONS ], &masked_key,0 , &acts);if (error) {
net/openvswitch/flow_table.c +12 -9
@@ -55,18 +55,21 @@ static u16 range_n_bytes(const struct sw_flow_key_range *range) }void ovs_flow_mask_key (struct sw_flow_key *dst,const struct sw_flow_key *src, -const struct sw_flow_mask *mask) +bool full,const struct sw_flow_mask *mask) { -const long *m = (long *)((u8 *)&mask->key + mask->range.start); -const long *s = (long *)((u8 *)src + mask->range.start); -long *d = (long *)((u8 *)dst + mask->range.start); +int start = full ?0 : mask->range.start; +int len = full ?sizeof *dst :range_n_bytes (&mask->range); +const long *m = (const long *)((const u8 *)&mask->key + start); +const long *s = (const long *)((const u8 *)src + start); +long *d = (long *)((u8 *)dst + start);int i; -/* The memory outside of the 'mask->range' are not set since -* further operations on 'dst' only uses contents within -* 'mask->range'. +/* If 'full' is true then all of 'dst' is fully initialized. Otherwise, +* if 'full' is false the memory outside of the 'mask->range' is left +* uninitialized. This can be used as an optimization when further +* operations on 'dst' only use contents within 'mask->range'. */ -for (i =0 ; i <range_n_bytes (&mask->range); i +=sizeof (long )) +for (i =0 ; i < len; i +=sizeof (long )) *d++ = *s++ & *m++; }
@@ -436,7 +439,7 @@ static struct sw_flow *masked_flow_lookup(struct table_instance *ti,u32 hash;struct sw_flow_key masked_key; -ovs_flow_mask_key (&masked_key, unmasked, mask); +ovs_flow_mask_key (&masked_key, unmasked, false, mask); hash =flow_hash (&masked_key, key_start, key_end); head =find_bucket (ti, hash);hlist_for_each_entry_rcu (flow, head, hash_node[ti->node_ver]) {
net/openvswitch/flow_table.h +1 -1
@@ -79,5 +79,5 @@ bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow, struct sw_flow_match *match);void ovs_flow_mask_key (struct sw_flow_key *dst,const struct sw_flow_key *src, -const struct sw_flow_mask *mask); +bool full,const struct sw_flow_mask *mask);#endif /* flow_table.h */
net/packet/af_packet.c +3 -5
@@ -2645,7 +2645,7 @@ static int packet_release(struct socket *sock)static int packet_do_bind (struct sock *sk,struct net_device *dev,__be16 proto) {struct packet_sock *po =pkt_sk (sk); -const struct net_device *dev_curr; +struct net_device *dev_curr;__be16 proto_curr;bool need_rehook;
@@ -2669,15 +2669,13 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, __be16 proto) po->num = proto; po->prot_hook.type = proto; - -if (po->prot_hook.dev) -dev_put (po->prot_hook.dev); - po->prot_hook.dev = dev; po->ifindex = dev ? dev->ifindex :0 ;packet_cached_dev_assign (po, dev); } +if (dev_curr) +dev_put (dev_curr);if (proto ==0 || !need_rehook) goto out_unlock;
net/rds/info.c +1 -1
@@ -176,7 +176,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval,/* check for all kinds of wrapping and the like */ start = (unsigned long )optval; -if (len <0 || len +PAGE_SIZE -1 < len || start + len < start) { +if (len <0 || len >INT_MAX -PAGE_SIZE +1 || start + len < start) { ret = -EINVAL ; goto out; }
net/sctp/protocol.c +41 -23
123 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.