Linux 3.14.1
Greg KH
maintainerI'm announcing the release of the 3.14.1 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 | 2 arch/arc/boot/dts/nsimosci.dts | 12 ++- arch/arc/configs/nsimosci_defconfig | 1 arch/m68k/Kconfig | 1 arch/s390/Kconfig | 1 arch/x86/crypto/ghash-clmulni-intel_asm.S | 29 -------- arch/x86/crypto/ghash-clmulni-intel_glue.c | 14 +++- arch/x86/include/asm/efi.h | 3 arch/x86/include/asm/pgtable_types.h | 2 arch/x86/mm/pageattr.c | 44 +++++++++--- arch/x86/platform/efi/efi.c | 99 ++++++++++++++++++++++------- arch/x86/platform/efi/efi_32.c | 7 +- arch/x86/platform/efi/efi_64.c | 32 ++++++++- drivers/isdn/isdnloop/isdnloop.c | 23 ++++-- drivers/net/ethernet/cadence/at91_ether.c | 3 drivers/net/ethernet/sfc/ef10.c | 7 ++ drivers/net/ethernet/sfc/efx.c | 3 drivers/net/vxlan.c | 6 + drivers/net/wireless/iwlwifi/mvm/rs.c | 36 +++++----- drivers/net/xen-netback/common.h | 5 + drivers/net/xen-netback/interface.c | 11 +++ drivers/net/xen-netback/netback.c | 49 ++++++++++++-- include/linux/futex.h | 4 + init/Kconfig | 7 ++ kernel/futex.c | 42 ++++++++---- lib/nlattr.c | 10 ++ net/ipv6/icmp.c | 2 net/ipv6/ip6_output.c | 4 - net/ipv6/mcast.c | 11 +-- net/ipv6/ping.c | 4 - net/rds/iw.c | 3 security/selinux/hooks.c | 36 +++++++--- sound/pci/hda/hda_intel.c | 4 - 33 files changed, 369 insertions(+), 148 deletions(-)
Ard Biesheuvel (1):
crypto: ghash-clmulni-intel - use C implementation for setkey()
Borislav Petkov (2):
x86, pageattr: Export page unmapping interface x86/efi: Make efi virtual runtime map passing more robust
Dan Carpenter (1):
isdnloop: several buffer overflows
Daniel Pieczko (1):
Call efx_set_channels() before efx->type->dimension_resources()
Eyal Shapira (1):
iwlwifi: mvm: rs: fix search cycle rules
Finn Thain (1):
m68k: Skip futex_atomic_cmpxchg_inatomic() test
Gilles Chanteperdrix (1):
net/at91_ether: avoid NULL pointer dereference
Greg Kroah-Hartman (1):
Linux 3.14.1
Hannes Frederic Sowa (1):
ipv6: some ipv6 statistic counters failed to disable bh
Heiko Carstens (1):
futex: Allow architectures to skip futex_atomic_cmpxchg_inatomic() test
Linus Torvalds (1):
futex: avoid race between requeue and wake
Mike Rapoport (1):
net: vxlan: fix crash when interface is created with no group
Mischa Jonker (1):
ARC: [nsimosci] Change .dts to use generic 8250 UART
Pablo Neira (1):
netlink: don't compare the nul-termination in nla_strcmp
Paul Durrant (3):
xen-netback: remove pointless clause from if statement
xen-netback: worse-case estimate in xenvif_rx_action is underestimating
xen-netback: BUG_ON in xenvif_rx_action() not catching overflow
Paul Moore (1):
selinux: correctly label /proc inodes in use before the policy is loaded
Sasha Levin (1):
rds: prevent dereference of a NULL device in rds_iw_laddr_check
Takashi Iwai (1):
Revert "ALSA: hda - Increment default stream numbers for AMD HDMI controllers"
Vineet Gupta (1):
ARC: [nsimosci] Unbork console
Wei Liu (1):
xen-netback: disable rogue vif in kthread context
YOSHIFUJI Hideaki (1):
isdnloop: Validate NUL-terminated strings from user.
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = NAME = Shuffling Zombie Juror
arch/arc/boot/dts/nsimosci.dts +7 -5
@@ -11,13 +11,16 @@ / { compatible = "snps,nsimosci"; - clock-frequency = <80000000>; /* 80 MHZ */ + clock-frequency = <20000000>; /* 20 MHZ */ #address-cells = <1>; #size-cells = <1>; interrupt-parent = <&intc>; chosen { - bootargs = "console=tty0 consoleblank=0"; + /* this is for console on PGU */ + /* bootargs = "console=tty0 consoleblank=0"; */ + /* this is for console on serial */ + bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=ttyS0,115200n8 consoleblank=0 debug"; }; aliases {
@@ -44,15 +47,14 @@ }; uart0: serial@c0000000 { - compatible = "snps,dw-apb-uart"; + compatible = "ns8250"; reg = <0xc0000000 0x2000>; interrupts = <11>; - #clock-frequency = <80000000>; clock-frequency = <3686400>; baud = <115200>; reg-shift = <2>; reg-io-width = <4>; - status = "okay"; + no-loopback-test = <1>; }; pgu0: pgu@c9000000 {
arch/arc/configs/nsimosci_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_SERIO_ARC_PS2=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_ARC=y CONFIG_SERIAL_ARC_CONSOLE=y # CONFIG_HW_RANDOM is not set
arch/m68k/Kconfig +1 -0
@@ -17,6 +17,7 @@ config M68K select FPU if MMU select ARCH_WANT_IPC_PARSE_VERSION select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE + select HAVE_FUTEX_CMPXCHG if MMU && FUTEX select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_REL select MODULES_USE_ELF_RELA
arch/s390/Kconfig +1 -0
@@ -117,6 +117,7 @@ config S390 select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACE_MCOUNT_TEST + select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZ4
arch/x86/crypto/ghash-clmulni-intel_asm.S +0 -29
@@ -24,10 +24,6 @@ .align 16 .Lbswap_mask: .octa 0x000102030405060708090a0b0c0d0e0f -.Lpoly: - .octa 0xc2000000000000000000000000000001 -.Ltwo_one: - .octa 0x00000001000000000000000000000001 #define DATA %xmm0 #define SHASH %xmm1
@@ -134,28 +130,3 @@ ENTRY(clmul_ghash_update) .Lupdate_just_ret: ret ENDPROC(clmul_ghash_update) - -/* - * void clmul_ghash_setkey(be128 *shash, const u8 *key); - * - * Calculate hash_key << 1 mod poly - */ -ENTRY(clmul_ghash_setkey) - movaps .Lbswap_mask, BSWAP - movups (%rsi), %xmm0 - PSHUFB_XMM BSWAP %xmm0 - movaps %xmm0, %xmm1 - psllq $1, %xmm0 - psrlq $63, %xmm1 - movaps %xmm1, %xmm2 - pslldq $8, %xmm1 - psrldq $8, %xmm2 - por %xmm1, %xmm0 - # reduction - pshufd $0b00100100, %xmm2, %xmm1 - pcmpeqd .Ltwo_one, %xmm1 - pand .Lpoly, %xmm1 - pxor %xmm1, %xmm0 - movups %xmm0, (%rdi) - ret -ENDPROC(clmul_ghash_setkey)
arch/x86/crypto/ghash-clmulni-intel_glue.c +11 -3
@@ -30,8 +30,6 @@ void clmul_ghash_mul(char *dst, const be128 *shash);void clmul_ghash_update (char *dst,const char *src,unsigned int srclen,const be128 *shash); -void clmul_ghash_setkey (be128 *shash,const u8 *key); -struct ghash_async_ctx {struct cryptd_ahash *cryptd_tfm; };
@@ -58,13 +56,23 @@ static int ghash_setkey(struct crypto_shash *tfm, const u8 *key, unsigned int keylen) {struct ghash_ctx *ctx =crypto_shash_ctx (tfm); +be128 *x = (be128 *)key; +u64 a, b;if (keylen !=GHASH_BLOCK_SIZE ) {crypto_shash_set_flags (tfm,CRYPTO_TFM_RES_BAD_KEY_LEN );return -EINVAL ; } -clmul_ghash_setkey (&ctx->shash, key); +/* perform multiplication by 'x' in GF(2^128) */ + a =be64_to_cpu (x->a); + b =be64_to_cpu (x->b); + + ctx->shash.a = (__be64)((b <<1 ) | (a >>63 )); + ctx->shash.b = (__be64)((a <<1 ) | (b >>63 )); + +if (a >>63 ) + ctx->shash.b ^=cpu_to_be64 (0xc2 );return 0 ; }
arch/x86/include/asm/efi.h +2 -1
@@ -130,7 +130,8 @@ extern void efi_memory_uc(u64 addr, unsigned long size);extern void __init efi_map_region (efi_memory_desc_t *md);extern void __init efi_map_region_fixed (efi_memory_desc_t *md);extern void efi_sync_low_kernel_mappings (void ); -extern void efi_setup_page_tables (void ); +extern int efi_setup_page_tables (unsigned long pa_memmap,unsigned num_pages); +extern void efi_cleanup_page_tables (unsigned long pa_memmap,unsigned num_pages);extern void __init old_map_region (efi_memory_desc_t *md);extern void __init runtime_code_page_mkexec (void );extern void __init efi_runtime_mkexec (void );
arch/x86/include/asm/pgtable_types.h +2 -0
@@ -385,6 +385,8 @@ extern pte_t *lookup_address(unsigned long address, unsigned int *level);extern phys_addr_t slow_virt_to_phys (void *__address);extern int kernel_map_pages_in_pgd (pgd_t *pgd,u64 pfn,unsigned long address,unsigned numpages,unsigned long page_flags); +void kernel_unmap_pages_in_pgd (pgd_t *root,unsigned long address, +unsigned numpages);#endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_PGTABLE_DEFS_H */
arch/x86/mm/pageattr.c +31 -13
84 lines not on this page · raw message
arch/x86/platform/efi/efi.c +78 -21
148 lines not on this page · raw message
arch/x86/platform/efi/efi_32.c +6 -1
@@ -40,7 +40,12 @@static unsigned long efi_rt_eflags;void efi_sync_low_kernel_mappings (void ) {} -void efi_setup_page_tables (void ) {} +void __init efi_dump_pagetable (void ) {} +int efi_setup_page_tables (unsigned long pa_memmap,unsigned num_pages) +{ +return 0 ; +} +void efi_cleanup_page_tables (unsigned long pa_memmap,unsigned num_pages) {}void __init efi_map_region (efi_memory_desc_t *md) {
arch/x86/platform/efi/efi_64.c +29 -3
@@ -137,12 +137,38 @@ void efi_sync_low_kernel_mappings(void) sizeof(pgd_t) * num_pgds); } -void efi_setup_page_tables (void ) +int efi_setup_page_tables (unsigned long pa_memmap,unsigned num_pages) { +pgd_t *pgd; + +if (efi_enabled (EFI_OLD_MEMMAP )) +return 0 ; + efi_scratch.efi_pgt = (pgd_t *)(unsigned long )real_mode_header->trampoline_pgd; + pgd =__va (efi_scratch.efi_pgt); -if (!efi_enabled (EFI_OLD_MEMMAP )) - efi_scratch.use_pgd = true; +/* +* It can happen that the physical address of new_memmap lands in memory +* which is not mapped in the EFI page table. Therefore we need to go +* and ident-map those pages containing the map before calling +* phys_efi_set_virtual_address_map(). +*/ +if (kernel_map_pages_in_pgd (pgd, pa_memmap, pa_memmap, num_pages, _PAGE_NX)) { +pr_err ("Error ident-mapping new memmap (0x%lx)!\n" , pa_memmap); +return 1 ; + } + + efi_scratch.use_pgd = true; + + +return 0 ; +} + +void efi_cleanup_page_tables (unsigned long pa_memmap,unsigned num_pages) +{ +pgd_t *pgd = (pgd_t *)__va (real_mode_header->trampoline_pgd); + +kernel_unmap_pages_in_pgd (pgd, pa_memmap, num_pages); }static void __init __map_region (efi_memory_desc_t *md,u64 va)
drivers/isdn/isdnloop/isdnloop.c +15 -8
@@ -518,9 +518,9 @@ static isdnloop_stat isdnloop_cmd_table[] =static void isdnloop_fake_err (isdnloop_card *card) { -char buf[60 ]; +char buf[64 ]; -sprintf (buf,"E%s" , card->omsg); +snprintf (buf,sizeof (buf),"E%s" , card->omsg);isdnloop_fake (card, buf,-1 );isdnloop_fake (card,"NAK" ,-1 ); }
@@ -903,6 +903,8 @@ isdnloop_parse_cmd(isdnloop_card *card)case 7 :/* 0x;EAZ */ p +=3 ; +if (strlen (p) >=sizeof (card->eazlist[0 ])) +break ;strcpy (card->eazlist[ch -1 ], p);break ;case 8 :
@@ -1070,6 +1072,12 @@ isdnloop_start(isdnloop_card *card, isdnloop_sdef *sdefp)return -EBUSY ;if (copy_from_user ((char *) &sdef, (char *) sdefp,sizeof (sdef)))return -EFAULT ; + +for (i =0 ; i <3 ; i++) { +if (!memchr (sdef.num[i],0 ,sizeof (sdef.num[i]))) +return -EINVAL ; + } +spin_lock_irqsave (&card->isdnloop_lock, flags);switch (sdef.ptype) {case ISDN_PTYPE_EURO :
@@ -1127,7 +1135,7 @@ isdnloop_command(isdn_ctrl *c, isdnloop_card *card) {ulong a;int i; -char cbuf[60 ]; +char cbuf[80 ];isdn_ctrl cmd;isdnloop_cdef cdef;
@@ -1192,7 +1200,6 @@ isdnloop_command(isdn_ctrl *c, isdnloop_card *card)break ;if ((c->arg &255 ) <ISDNLOOP_BCH ) {char *p; -char dial[50 ];char dcode[4 ]; a = c->arg;
@@ -1204,10 +1211,10 @@ isdnloop_command(isdn_ctrl *c, isdnloop_card *card) }else /* Normal Dial */ strcpy (dcode,"CAL" ); -strcpy (dial, p); -sprintf (cbuf,"%02d;D%s_R%s,%02d,%02d,%s\n" , (int ) (a +1 ), - dcode, dial, c->parm.setup.si1, - c->parm.setup.si2, c->parm.setup.eazmsn); +snprintf (cbuf,sizeof (cbuf), +"%02d;D%s_R%s,%02d,%02d,%s\n" , (int ) (a +1 ), + dcode, p, c->parm.setup.si1, + c->parm.setup.si2, c->parm.setup.eazmsn); i =isdnloop_writecmd (cbuf,strlen (cbuf),0 , card); }break ;
drivers/net/ethernet/cadence/at91_ether.c +3 -0
@@ -342,6 +342,9 @@ static int __init at91ether_probe(struct platform_device *pdev) }clk_enable (lp->pclk); + lp->hclk =ERR_PTR (-ENOENT ); + lp->tx_clk =ERR_PTR (-ENOENT ); +/* Install the interrupt handler */ dev->irq =platform_get_irq (pdev,0 ); res =devm_request_irq (&pdev->dev, dev->irq, at91ether_interrupt,0 , dev->name, dev);
drivers/net/ethernet/sfc/ef10.c +7 -0
@@ -565,10 +565,17 @@ static int efx_ef10_dimension_resources(struct efx_nic *efx)* several of each (in fact that's the only option if host * page size is >4K). So we may allocate some extra VIs just * for writing PIO buffers through. +* +* The UC mapping contains (min_vis - 1) complete VIs and the +* first half of the next VI. Then the WC mapping begins with +* the second half of this last VI. */ uc_mem_map_size =PAGE_ALIGN ((min_vis -1 ) *EFX_VI_PAGE_SIZE +ER_DZ_TX_PIOBUF );if (nic_data->n_piobufs) { +/* pio_write_vi_base rounds down to give the number of complete +* VIs inside the UC mapping. +*/ pio_write_vi_base = uc_mem_map_size /EFX_VI_PAGE_SIZE ; wc_mem_map_size = (PAGE_ALIGN((pio_write_vi_base + nic_data->n_piobufs) *
drivers/net/ethernet/sfc/efx.c +2 -1
@@ -1603,6 +1603,8 @@ static int efx_probe_nic(struct efx_nic *efx)if (rc) goto fail1; +efx_set_channels (efx); + rc = efx->type->dimension_resources (efx);if (rc) goto fail2;
@@ -1613,7 +1615,6 @@ static int efx_probe_nic(struct efx_nic *efx) efx->rx_indir_table[i] =ethtool_rxfh_indir_default (i, efx->rss_spread); -efx_set_channels (efx);netif_set_real_num_tx_queues (efx->net_dev, efx->n_tx_channels);netif_set_real_num_rx_queues (efx->net_dev, efx->n_rx_channels);
drivers/net/vxlan.c +5 -1
@@ -871,6 +871,9 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],if (err)return err; +if (vxlan->default_dst.remote_ip.sa.sa_family != ip.sa.sa_family) +return -EAFNOSUPPORT ; +spin_lock_bh (&vxlan->hash_lock); err =vxlan_fdb_create (vxlan, addr, &ip, ndm->ndm_state, flags, port, vni, ifindex, ndm->ndm_flags);
@@ -2612,9 +2615,10 @@ static int vxlan_newlink(struct net *net, struct net_device *dev, vni =nla_get_u32 (data[IFLA_VXLAN_ID ]); dst->remote_vni = vni; +/* Unless IPv6 is explicitly requested, assume IPv4 */ + dst->remote_ip.sa.sa_family =AF_INET ;if (data[IFLA_VXLAN_GROUP ]) { dst->remote_ip.sin.sin_addr.s_addr =nla_get_be32 (data[IFLA_VXLAN_GROUP ]); - dst->remote_ip.sa.sa_family =AF_INET ; }else if (data[IFLA_VXLAN_GROUP6 ]) {if (!IS_ENABLED (CONFIG_IPV6 ))return -EPFNOSUPPORT ;
drivers/net/wireless/iwlwifi/mvm/rs.c +18 -18
@@ -211,9 +211,9 @@ static const struct rs_tx_column rs_tx_columns[] = { .next_columns = {RS_COLUMN_LEGACY_ANT_B ,RS_COLUMN_SISO_ANT_A , +RS_COLUMN_SISO_ANT_B ,RS_COLUMN_MIMO2 , -RS_COLUMN_INVALID , - RS_COLUMN_INVALID, + RS_COLUMN_MIMO2_SGI, }, }, [RS_COLUMN_LEGACY_ANT_B] = {
@@ -221,10 +221,10 @@ static const struct rs_tx_column rs_tx_columns[] = { .ant = ANT_B, .next_columns = {RS_COLUMN_LEGACY_ANT_A , +RS_COLUMN_SISO_ANT_A ,RS_COLUMN_SISO_ANT_B ,RS_COLUMN_MIMO2 , -RS_COLUMN_INVALID , - RS_COLUMN_INVALID, + RS_COLUMN_MIMO2_SGI, }, }, [RS_COLUMN_SISO_ANT_A] = {
@@ -234,8 +234,8 @@ static const struct rs_tx_column rs_tx_columns[] = { RS_COLUMN_SISO_ANT_B,RS_COLUMN_MIMO2 ,RS_COLUMN_SISO_ANT_A_SGI , -RS_COLUMN_INVALID , -RS_COLUMN_INVALID , +RS_COLUMN_SISO_ANT_B_SGI , +RS_COLUMN_MIMO2_SGI , }, .checks = { rs_siso_allow,
@@ -248,8 +248,8 @@ static const struct rs_tx_column rs_tx_columns[] = { RS_COLUMN_SISO_ANT_A,RS_COLUMN_MIMO2 ,RS_COLUMN_SISO_ANT_B_SGI , -RS_COLUMN_INVALID , -RS_COLUMN_INVALID , +RS_COLUMN_SISO_ANT_A_SGI , +RS_COLUMN_MIMO2_SGI , }, .checks = { rs_siso_allow,
@@ -263,8 +263,8 @@ static const struct rs_tx_column rs_tx_columns[] = { RS_COLUMN_SISO_ANT_B_SGI,RS_COLUMN_MIMO2_SGI ,RS_COLUMN_SISO_ANT_A , -RS_COLUMN_INVALID , -RS_COLUMN_INVALID , +RS_COLUMN_SISO_ANT_B , +RS_COLUMN_MIMO2 , }, .checks = { rs_siso_allow,
@@ -279,8 +279,8 @@ static const struct rs_tx_column rs_tx_columns[] = { RS_COLUMN_SISO_ANT_A_SGI,RS_COLUMN_MIMO2_SGI ,RS_COLUMN_SISO_ANT_B , -RS_COLUMN_INVALID , -RS_COLUMN_INVALID , +RS_COLUMN_SISO_ANT_A , +RS_COLUMN_MIMO2 , }, .checks = { rs_siso_allow,
@@ -292,10 +292,10 @@ static const struct rs_tx_column rs_tx_columns[] = { .ant = ANT_AB, .next_columns = {RS_COLUMN_SISO_ANT_A , +RS_COLUMN_SISO_ANT_B , +RS_COLUMN_SISO_ANT_A_SGI , +RS_COLUMN_SISO_ANT_B_SGI , RS_COLUMN_MIMO2_SGI, -RS_COLUMN_INVALID , -RS_COLUMN_INVALID , - RS_COLUMN_INVALID, }, .checks = { rs_mimo_allow,
@@ -307,10 +307,10 @@ static const struct rs_tx_column rs_tx_columns[] = { .sgi = true, .next_columns = {RS_COLUMN_SISO_ANT_A_SGI , +RS_COLUMN_SISO_ANT_B_SGI , +RS_COLUMN_SISO_ANT_A , +RS_COLUMN_SISO_ANT_B , RS_COLUMN_MIMO2, -RS_COLUMN_INVALID , -RS_COLUMN_INVALID , - RS_COLUMN_INVALID, }, .checks = { rs_mimo_allow,
drivers/net/xen-netback/common.h +5 -0
@@ -113,6 +113,11 @@ struct xenvif {domid_t domid;unsigned int handle; +/* Is this interface disabled? True when backend discovers +* frontend is rogue. +*/ +bool disabled; +/* Use NAPI for guest TX */ struct napi_struct napi;/* When feature-split-event-channels = 0, tx_irq = rx_irq. */
drivers/net/xen-netback/interface.c +11 -0
@@ -62,6 +62,15 @@ static int xenvif_poll(struct napi_struct *napi, int budget) struct xenvif *vif = container_of(napi, struct xenvif, napi);int work_done; +/* This vif is rogue, we pretend we've there is nothing to do +* for this vif to deschedule it from NAPI. But this interface +* will be turned off in thread context later. +*/ +if (unlikely (vif->disabled)) { +napi_complete (napi); +return 0 ; + } + work_done =xenvif_tx_action (vif, budget);if (work_done < budget) {
@@ -321,6 +330,8 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid, vif->ip_csum =1 ; vif->dev = dev; + vif->disabled = false; + vif->credit_bytes = vif->remaining_credit = ~0UL ; vif->credit_usec =0UL ;init_timer (&vif->credit_timeout);
drivers/net/xen-netback/netback.c +43 -6
95 lines not on this page · raw message
include/linux/futex.h +4 -0
@@ -55,7 +55,11 @@ union futex_key {#ifdef CONFIG_FUTEX extern void exit_robust_list (struct task_struct *curr);extern void exit_pi_state_list (struct task_struct *curr); +#ifdef CONFIG_HAVE_FUTEX_CMPXCHG +#define futex_cmpxchg_enabled 1 +#else extern int futex_cmpxchg_enabled; +#endif #else static inline void exit_robust_list (struct task_struct *curr) {
init/Kconfig +7 -0
@@ -1387,6 +1387,13 @@ config FUTEX support for "fast userspace mutexes". The resulting kernel may not run glibc-based applications correctly. +config HAVE_FUTEX_CMPXCHG + bool + help + Architectures should select this if futex_atomic_cmpxchg_inatomic() + is implemented and always working. This removes a couple of runtime + checks. + config EPOLL bool "Enable eventpoll support" if EXPERT default y
kernel/futex.c +29 -13
93 lines not on this page · raw message
lib/nlattr.c +8 -2
@@ -303,9 +303,15 @@ int nla_memcmp(const struct nlattr *nla, const void *data,*/ int nla_strcmp (const struct nlattr *nla,const char *str) { -int len =strlen (str) +1 ; -int d =nla_len (nla) - len; +int len =strlen (str); +char *buf =nla_data (nla); +int attrlen =nla_len (nla); +int d; +if (attrlen >0 && buf[attrlen -1 ] =='\0' ) + attrlen--; + + d = attrlen - len;if (d ==0 ) d =memcmp (nla_data (nla), str, len);
net/ipv6/icmp.c +1 -1
@@ -520,7 +520,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) np->tclass,NULL , &fl6, (struct rt6_info *)dst, MSG_DONTWAIT, np->dontfrag);if (err) { -ICMP6_INC_STATS_BH (net, idev,ICMP6_MIB_OUTERRORS ); +ICMP6_INC_STATS (net, idev,ICMP6_MIB_OUTERRORS );ip6_flush_pending_frames (sk); }else { err = icmpv6_push_pending_frames(sk, &fl6, &tmp_hdr,
net/ipv6/ip6_output.c +2 -2
@@ -1566,8 +1566,8 @@ int ip6_push_pending_frames(struct sock *sk)if (proto ==IPPROTO_ICMPV6 ) {struct inet6_dev *idev =ip6_dst_idev (skb_dst (skb)); -ICMP6MSGOUT_INC_STATS_BH (net, idev,icmp6_hdr (skb)->icmp6_type); -ICMP6_INC_STATS_BH (net, idev,ICMP6_MIB_OUTMSGS ); +ICMP6MSGOUT_INC_STATS (net, idev,icmp6_hdr (skb)->icmp6_type); +ICMP6_INC_STATS (net, idev,ICMP6_MIB_OUTMSGS ); } err =ip6_local_out (skb);
net/ipv6/mcast.c +6 -5
@@ -1620,11 +1620,12 @@ static void mld_sendpack(struct sk_buff *skb) dst_output); out:if (!err) { -ICMP6MSGOUT_INC_STATS_BH (net, idev,ICMPV6_MLD2_REPORT ); -ICMP6_INC_STATS_BH (net, idev,ICMP6_MIB_OUTMSGS ); -IP6_UPD_PO_STATS_BH (net, idev,IPSTATS_MIB_OUTMCAST , payload_len); - }else -IP6_INC_STATS_BH (net, idev,IPSTATS_MIB_OUTDISCARDS ); +ICMP6MSGOUT_INC_STATS (net, idev,ICMPV6_MLD2_REPORT ); +ICMP6_INC_STATS (net, idev,ICMP6_MIB_OUTMSGS ); +IP6_UPD_PO_STATS (net, idev,IPSTATS_MIB_OUTMCAST , payload_len); + }else { +IP6_INC_STATS (net, idev,IPSTATS_MIB_OUTDISCARDS ); + }rcu_read_unlock ();return ;
net/ipv6/ping.c +2 -2
@@ -182,8 +182,8 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, MSG_DONTWAIT, np->dontfrag);if (err) { -ICMP6_INC_STATS_BH (sock_net (sk), rt->rt6i_idev, -ICMP6_MIB_OUTERRORS ); +ICMP6_INC_STATS (sock_net (sk), rt->rt6i_idev, +ICMP6_MIB_OUTERRORS );ip6_flush_pending_frames (sk); }else { err = icmpv6_push_pending_frames(sk, &fl6,
net/rds/iw.c +2 -1
@@ -239,7 +239,8 @@ static int rds_iw_laddr_check(__be32 addr) ret =rdma_bind_addr (cm_id, (struct sockaddr *)&sin);/* due to this, we will claim to support IB devices unless we check node_type. */ -if (ret || cm_id->device->node_type !=RDMA_NODE_RNIC ) +if (ret || !cm_id->device || + cm_id->device->node_type !=RDMA_NODE_RNIC ) ret = -EADDRNOTAVAIL ; rdsdebug("addr %pI4 ret %d node type %d\n",
security/selinux/hooks.c +27 -9
@@ -1418,15 +1418,33 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent isec->sid = sbsec->sid;if ((sbsec->flags &SE_SBPROC ) && !S_ISLNK (inode->i_mode)) { -if (opt_dentry) { - isec->sclass =inode_mode_to_security_class (inode->i_mode); - rc =selinux_proc_get_sid (opt_dentry, - isec->sclass, - &sid); -if (rc) - goto out_unlock; - isec->sid = sid; - } +/* We must have a dentry to determine the label on +* procfs inodes */ +if (opt_dentry) +/* Called from d_instantiate or +* d_splice_alias. */ + dentry =dget (opt_dentry); +else +/* Called from selinux_complete_init, try to +* find a dentry. */ + dentry =d_find_alias (inode); +/* +* This can be hit on boot when a file is accessed +* before the policy is loaded. When we load policy we +* may find inodes that have no dentry on the +* sbsec->isec_head list. No reason to complain as +* these will get fixed up the next time we go through +* inode_doinit() with a dentry, before these inodes +* could be used again by userspace. +*/ +if (!dentry) + goto out_unlock; + isec->sclass =inode_mode_to_security_class (inode->i_mode); + rc =selinux_proc_get_sid (dentry, isec->sclass, &sid); +dput (dentry); +if (rc) + goto out_unlock; + isec->sid = sid; }break ; }
sound/pci/hda/hda_intel.c +2 -2
@@ -297,9 +297,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };#define ULI_NUM_CAPTURE 5#define ULI_NUM_PLAYBACK 6 -/* ATI HDMI may have up to 8 playbacks and 0 capture */ +/* ATI HDMI has 1 playback and 0 capture */ #define ATIHDMI_NUM_CAPTURE 0 -#define ATIHDMI_NUM_PLAYBACK 8 +#define ATIHDMI_NUM_PLAYBACK 1/* TERA has 4 playback and 3 capture */ #define TERA_NUM_CAPTURE 3