Linux 3.14.17
Greg KH
maintainerI'm announcing the release of the 3.14.17 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/sparc/include/asm/pgtable_64.h | 89 ++++++++++++--------- arch/sparc/include/asm/tlbflush_64.h | 12 -- arch/sparc/include/asm/tsb.h | 3 arch/sparc/kernel/head_64.S | 4 arch/sparc/kernel/ktlb.S | 2 arch/sparc/kernel/ldc.c | 2 arch/sparc/kernel/smp_64.c | 6 - arch/sparc/kernel/sys32.S | 2 arch/sparc/kernel/unaligned_64.c | 12 ++ arch/sparc/lib/NG2memcpy.S | 1 arch/sparc/math-emu/math_32.c | 2 arch/sparc/mm/fault_64.c | 98 ++++++++++++------------ arch/sparc/mm/gup.c | 2 arch/sparc/mm/init_64.c | 43 +++++++++- arch/sparc/mm/tlb.c | 26 ++++-- arch/sparc/mm/tsb.c | 14 +++ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 9 ++ drivers/net/ethernet/brocade/bna/bnad.c | 2 drivers/net/macvlan.c | 1 drivers/net/phy/phy_device.c | 2 drivers/net/ppp/pptp.c | 2 drivers/sbus/char/bbc_envctrl.c | 6 + drivers/sbus/char/bbc_i2c.c | 11 +- drivers/tty/serial/sunsab.c | 9 ++ fs/xfs/xfs_log.h | 19 +++- fs/xfs/xfs_log_cil.c | 7 - include/net/inetpeer.h | 16 --- include/net/ip.h | 31 +++---- include/net/ip_tunnels.h | 1 include/net/ipv6.h | 2 include/net/secure_seq.h | 2 net/batman-adv/fragmentation.c | 10 +- net/compat.c | 9 +- net/core/iovec.c | 10 +- net/core/secure_seq.c | 25 ------ net/core/skbuff.c | 2 net/ipv4/igmp.c | 4 net/ipv4/inetpeer.c | 18 ---- net/ipv4/ip_output.c | 7 - net/ipv4/ip_tunnel.c | 29 ++++--- net/ipv4/ip_tunnel_core.c | 2 net/ipv4/ipmr.c | 2 net/ipv4/raw.c | 2 net/ipv4/route.c | 63 +++++++++------ net/ipv4/tcp_vegas.c | 3 net/ipv4/tcp_veno.c | 2 net/ipv4/xfrm4_mode_tunnel.c | 2 net/ipv6/ip6_output.c | 14 +++ net/ipv6/output_core.c | 23 ----- net/netfilter/ipvs/ip_vs_xmit.c | 2 net/sctp/associola.c | 1 net/sctp/output.c | 2 net/xfrm/xfrm_user.c | 7 - 55 files changed, 378 insertions(+), 302 deletions(-)
Andrey Ryabinin (1):
net: sendmsg: fix NULL pointer dereference
Andrey Utkin (1):
arch/sparc/math-emu/math_32.c: drop stray break operator
Christoph Paasch (2):
tcp: Fix integer-overflows in TCP veno
tcp: Fix integer-overflow in TCP vegas
Christopher Alexander Tobias Schulze (2):
bbc-i2c: Fix BBC I2C envctrl on SunBlade 2000
sunsab: Fix detection of BREAK on sunsab serial console
Daniel Borkmann (1):
net: sctp: inherit auth_capable on INIT collisions
Dave Chinner (1):
xfs: log vector rounding leaks log space
David S. Miller (17):
sparc64: Fix argument sign extension for compat_sys_futex().
sparc64: Fix executable bit testing in set_pmd_at() paths.
sparc64: Fix huge PMD invalidation.
sparc64: Fix bugs in get_user_pages_fast() wrt. THP.
sparc64: Fix hex values in comment above pte_modify().
sparc64: Don't use _PAGE_PRESENT in pte_modify() mask.
sparc64: Handle 32-bit tasks properly in compute_effective_address().
sparc64: Fix top-level fault handling bugs.
sparc64: Fix range check in kern_addr_valid().
sparc64: Use 'ILOG2_4MB' instead of constant '22'.
sparc64: Add basic validations to {pud,pmd}_bad().
sparc64: Give more detailed information in {pgd,pmd}_ERROR() and kill pte_ERROR().
sparc64: Don't bark so loudly about 32-bit tasks generating 64-bit fault addresses.
sparc64: Fix huge TSB mapping on pre-UltraSPARC-III cpus.
sparc64: Add membar to Niagara2 memcpy code.
sparc64: Do not insert non-valid PTEs into the TSB hash table.
sparc64: Guard against flushing openfirmware mappings.
Dmitry Kravkov (1):
bnx2x: fix crash during TSO tunneling
Dmitry Popov (1):
ip_tunnel(ipv4): fix tunnels with "local any remote $remote_ip"
Eric Dumazet (3):
inetpeer: get rid of ip_id_count
ip: make IP identifiers less predictable
sctp: fix possible seqlock seadlock in sctp_packet_transmit()
Florian Fainelli (1):
net: phy: re-apply PHY fixups during phy_register_device
Greg Kroah-Hartman (1):
Linux 3.14.17
Ivan Vecera (1):
bna: fix performance regression
Kirill Tkhai (1):
sparc64: Make itc_sync_lock raw
Sasha Levin (1):
iovec: make sure the caller actually wants anything in memcpy_fromiovecend
Sowmini Varadhan (1):
sparc64: ldc_connect() should not return EINVAL when handshake is in progress.
Sven Eckelmann (1):
batman-adv: Fix out-of-order fragmentation support
Tobias Brunner (1):
xfrm: Fix installation of AH IPsec SAs
Vlad Yasevich (2):
macvlan: Initialize vlan_features to turn on offload support.
net: Correctly set segment mac_len in skb_segment().
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 16 +SUBLEVEL = 17 EXTRAVERSION = NAME = Remembering Coco
arch/sparc/include/asm/pgtable_64.h +50 -39
164 lines not on this page · raw message
arch/sparc/include/asm/tlbflush_64.h +2 -10
@@ -34,6 +34,8 @@ static inline void flush_tlb_range(struct vm_area_struct *vma, { } +void flush_tlb_kernel_range (unsigned long start,unsigned long end); +#define __HAVE_ARCH_ENTER_LAZY_MMU_MODEextern void flush_tlb_pending (void );
@@ -48,11 +50,6 @@ extern void __flush_tlb_kernel_range(unsigned long start, unsigned long end);#ifndef CONFIG_SMP -#define flush_tlb_kernel_range (start,end) \ -do { flush_tsb_kernel_range(start,end); \ - __flush_tlb_kernel_range(start,end); \ -} while (0) -static inline void global_flush_tlb_page (struct mm_struct *mm,unsigned long vaddr) {__flush_tlb_page (CTX_HWBITS (mm->context), vaddr);
@@ -63,11 +60,6 @@ static inline void global_flush_tlb_page(struct mm_struct *mm, unsigned long vadextern void smp_flush_tlb_kernel_range (unsigned long start,unsigned long end);extern void smp_flush_tlb_page (struct mm_struct *mm,unsigned long vaddr); -#define flush_tlb_kernel_range (start, end) \ -do { flush_tsb_kernel_range(start,end); \ - smp_flush_tlb_kernel_range(start, end); \ -} while (0) -#define global_flush_tlb_page (mm, vaddr) \ smp_flush_tlb_page(mm, vaddr)
arch/sparc/include/asm/tsb.h +2 -1
@@ -171,7 +171,8 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end; andcc REG1, REG2, %g0; \ be,pt %xcc,700f ; \ sethi %hi (4 *1024 *1024 ),REG2 ; \ -andn REG1 ,REG2 ,REG1 ; \ + brgez,pn REG1, FAIL_LABEL; \ +andn REG1 ,REG2 ,REG1 ; \and VADDR ,REG2 ,REG2 ; \ brlz,pt REG1, PTE_LABEL; \or REG1 ,REG2 ,REG1 ; \
arch/sparc/kernel/head_64.S +2 -2
@@ -282,8 +282,8 @@ sun4v_chip_type: stx %l2, [%l4 + 0x0] ldx [%sp + 2047 + 128 + 0x50], %l3 ! physaddr low /* 4MB align */ - srlx %l3, 22, %l3 - sllx %l3, 22, %l3 + srlx %l3, ILOG2_4MB, %l3 + sllx %l3, ILOG2_4MB, %l3 stx %l3, [%l4 + 0x8] /* Leave service as-is, "call-method" */
arch/sparc/kernel/ktlb.S +1 -1
@@ -277,7 +277,7 @@ kvmap_dtlb_load: #ifdef CONFIG_SPARSEMEM_VMEMMAP kvmap_vmemmap: sub %g4, %g5, %g5 - srlx %g5, 22, %g5 + srlx %g5, ILOG2_4MB, %g5 sethi %hi(vmemmap_table), %g1 sllx %g5, 3, %g5 or %g1, %lo(vmemmap_table), %g1
arch/sparc/kernel/ldc.c +1 -1
@@ -1336,7 +1336,7 @@ int ldc_connect(struct ldc_channel *lp)if (!(lp->flags &LDC_FLAG_ALLOCED_QUEUES ) || !(lp->flags &LDC_FLAG_REGISTERED_QUEUES ) || lp->hs_state !=LDC_HS_OPEN ) - err = -EINVAL ; + err = ((lp->hs_state >LDC_HS_OPEN ) ?0 : -EINVAL );else err =start_handshake (lp);
arch/sparc/kernel/smp_64.c +3 -3
@@ -151,7 +151,7 @@ void cpu_panic(void)#define NUM_ROUNDS 64/* magic value */ #define NUM_ITERS 5/* likewise */ -static DEFINE_SPINLOCK (itc_sync_lock); +static DEFINE_RAW_SPINLOCK (itc_sync_lock);static unsigned long go[SLAVE +1 ];#define DEBUG_TICK_SYNC 0
@@ -259,7 +259,7 @@ static void smp_synchronize_one_tick(int cpu) go[MASTER ] =0 ;membar_safe ("#StoreLoad" ); -spin_lock_irqsave (&itc_sync_lock, flags); +raw_spin_lock_irqsave (&itc_sync_lock, flags); {for (i =0 ; i <NUM_ROUNDS *NUM_ITERS ; i++) {while (!go[MASTER ])
@@ -270,7 +270,7 @@ static void smp_synchronize_one_tick(int cpu)membar_safe ("#StoreLoad" ); } } -spin_unlock_irqrestore (&itc_sync_lock, flags); +raw_spin_unlock_irqrestore (&itc_sync_lock, flags); }#if defined(CONFIG_SUN_LDOMS ) && defined(CONFIG_HOTPLUG_CPU )
arch/sparc/kernel/sys32.S +1 -1
@@ -44,7 +44,7 @@ SIGN1(sys32_timer_settime, compat_sys_timer_settime, %o1) SIGN1(sys32_io_submit, compat_sys_io_submit, %o1) SIGN1(sys32_mq_open, compat_sys_mq_open, %o1) SIGN1(sys32_select, compat_sys_select, %o0) -SIGN3(sys32_futex, compat_sys_futex, %o1, %o2, %o5) +SIGN1(sys32_futex, compat_sys_futex, %o1) SIGN1(sys32_recvfrom, compat_sys_recvfrom, %o0) SIGN1(sys32_recvmsg, compat_sys_recvmsg, %o0) SIGN1(sys32_sendmsg, compat_sys_sendmsg, %o0)
arch/sparc/kernel/unaligned_64.c +9 -3
@@ -166,17 +166,23 @@ static unsigned long *fetch_reg_addr(unsigned int reg, struct pt_regs *regs)unsigned long compute_effective_address (struct pt_regs *regs,unsigned int insn,unsigned int rd) { +int from_kernel = (regs->tstate &TSTATE_PRIV ) !=0 ;unsigned int rs1 = (insn >>14 ) &0x1f ;unsigned int rs2 = insn &0x1f ; -int from_kernel = (regs->tstate &TSTATE_PRIV ) !=0 ; +unsigned long addr;if (insn &0x2000 ) {maybe_flush_windows (rs1,0 , rd, from_kernel); -return (fetch_reg (rs1, regs) +sign_extend_imm13 (insn)); + addr = (fetch_reg (rs1, regs) +sign_extend_imm13 (insn)); }else {maybe_flush_windows (rs1, rs2, rd, from_kernel); -return (fetch_reg (rs1, regs) +fetch_reg (rs2, regs)); + addr = (fetch_reg (rs1, regs) +fetch_reg (rs2, regs)); } + +if (!from_kernel &&test_thread_flag (TIF_32BIT )) + addr &=0xffffffff ; + +return addr; }/* This is just to make gcc think die_if_kernel does return... */
arch/sparc/lib/NG2memcpy.S +1 -0
@@ -236,6 +236,7 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ */ VISEntryHalf + membar #Sync alignaddr %o1, %g0, %g0 add %o1, (64 - 1), %o4
arch/sparc/math-emu/math_32.c +1 -1
@@ -499,7 +499,7 @@ static int do_one_mathemu(u32 insn, unsigned long *pfsr, unsigned long *fregs)case 0 : fsr = *pfsr;if (IR ==-1 )IR =2 ;/* fcc is always fcc0 */ - fsr &= ~0xc00 ; fsr |= (IR <<10 );break ; + fsr &= ~0xc00 ; fsr |= (IR <<10 ); *pfsr = fsr;break ;case 1 : rd->s =IR ;break ;
arch/sparc/mm/fault_64.c +53 -45
150 lines not on this page · raw message
arch/sparc/mm/gup.c +1 -1
@@ -73,7 +73,7 @@ static int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,struct page *head, *page, *tail;int refs; -if (!pmd_large (pmd)) +if (!(pmd_val (pmd) & _PAGE_VALID))return 0 ;if (write && !pmd_write (pmd))
arch/sparc/mm/init_64.c +37 -6
94 lines not on this page · raw message
arch/sparc/mm/tlb.c +20 -6
@@ -134,7 +134,7 @@ no_cache_flush:#ifdef CONFIG_TRANSPARENT_HUGEPAGE static void tlb_batch_pmd_scan (struct mm_struct *mm,unsigned long vaddr, -pmd_t pmd,bool exec) +pmd_t pmd) {unsigned long end;pte_t *pte;
@@ -142,8 +142,11 @@ static void tlb_batch_pmd_scan(struct mm_struct *mm, unsigned long vaddr, pte =pte_offset_map (&pmd, vaddr); end = vaddr +HPAGE_SIZE ;while (vaddr < end) { -if (pte_val (*pte) & _PAGE_VALID) +if (pte_val (*pte) & _PAGE_VALID) { +bool exec =pte_exec (*pte); +tlb_batch_add_one (mm, vaddr, exec); + } pte++; vaddr +=PAGE_SIZE ; }
@@ -177,19 +180,30 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr, }if (!pmd_none (orig)) { -pte_t orig_pte =__pte (pmd_val (orig)); -bool exec =pte_exec (orig_pte); - addr &=HPAGE_MASK ;if (pmd_trans_huge (orig)) { +pte_t orig_pte =__pte (pmd_val (orig)); +bool exec =pte_exec (orig_pte); +tlb_batch_add_one (mm, addr, exec);tlb_batch_add_one (mm, addr +REAL_HPAGE_SIZE , exec); }else { -tlb_batch_pmd_scan (mm, addr, orig, exec); +tlb_batch_pmd_scan (mm, addr, orig); } } } +void pmdp_invalidate (struct vm_area_struct *vma,unsigned long address, +pmd_t *pmdp) +{ +pmd_t entry = *pmdp; + +pmd_val (entry) &= ~_PAGE_VALID; + +set_pmd_at (vma->vm_mm, address, pmdp, entry); +flush_tlb_range (vma, address, address +HPAGE_PMD_SIZE ); +} +void pgtable_trans_huge_deposit (struct mm_struct *mm,pmd_t *pmdp,pgtable_t pgtable) {
arch/sparc/mm/tsb.c +13 -1
@@ -133,7 +133,19 @@ static void setup_tsb_params(struct mm_struct *mm, unsigned long tsb_idx, unsign mm->context.tsb_block[tsb_idx].tsb_nentries = tsb_bytes /sizeof (struct tsb ); - base =TSBMAP_BASE ; +switch (tsb_idx) { +case MM_TSB_BASE : + base =TSBMAP_8K_BASE ; +break ; +#if defined(CONFIG_HUGETLB_PAGE ) || defined(CONFIG_TRANSPARENT_HUGEPAGE ) +case MM_TSB_HUGE : + base =TSBMAP_4M_BASE ; +break ; +#endif +default : +BUG (); + } + tte =pgprot_val (PAGE_KERNEL_LOCKED ); tsb_paddr =__pa (mm->context.tsb_block[tsb_idx].tsb);BUG_ON (tsb_paddr & (tsb_bytes -1UL ));
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +1 -0
@@ -337,6 +337,7 @@ struct sw_tx_bd {u8 flags;/* Set on the first BD descriptor when there is a split BD */ #define BNX2X_TSO_SPLIT_BD (1<<0) +#define BNX2X_HAS_SECOND_PBD (1<<1) };struct sw_rx_page {
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +9 -0
@@ -223,6 +223,12 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata, --nbd; bd_idx =TX_BD (NEXT_TX_IDX (bd_idx)); +if (tx_buf->flags &BNX2X_HAS_SECOND_PBD ) { +/* Skip second parse bd... */ + --nbd; + bd_idx =TX_BD (NEXT_TX_IDX (bd_idx)); + } +/* TSO headers+data bds share a common mapping. See bnx2x_tx_split() */ if (tx_buf->flags &BNX2X_TSO_SPLIT_BD ) { tx_data_bd = &txdata->tx_desc_ring[bd_idx].reg_bd;
@@ -3868,6 +3874,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)/* set encapsulation flag in start BD */ SET_FLAG (tx_start_bd->general_data,ETH_TX_START_BD_TUNNEL_EXIST ,1 ); + + tx_buf->flags |=BNX2X_HAS_SECOND_PBD ; + nbd++; }else if (xmit_type &XMIT_CSUM ) {/* Set PBD in checksum offload case w/o encapsulation */
drivers/net/ethernet/brocade/bna/bnad.c +1 -1
@@ -600,9 +600,9 @@ bnad_cq_process(struct bnad *bnad, struct bna_ccb *ccb, int budget)prefetch (bnad->netdev); cq = ccb->sw_q; - cmpl = &cq[ccb->producer_index];while (packets < budget) { + cmpl = &cq[ccb->producer_index];if (!cmpl->valid)break ;/* The 'valid' field is set by the adapter, only after writing
drivers/net/macvlan.c +1 -0
@@ -548,6 +548,7 @@ static int macvlan_init(struct net_device *dev) (lowerdev->state &MACVLAN_STATE_MASK ); dev->features = lowerdev->features &MACVLAN_FEATURES ; dev->features |=ALWAYS_ON_FEATURES ; + dev->vlan_features = lowerdev->vlan_features &MACVLAN_FEATURES ; dev->gso_max_size = lowerdev->gso_max_size; dev->iflink = lowerdev->ifindex; dev->hard_header_len = lowerdev->hard_header_len;
drivers/net/phy/phy_device.c +1 -1
@@ -353,7 +353,7 @@ int phy_device_register(struct phy_device *phydev) phydev->bus->phy_map[phydev->addr] = phydev;/* Run all of the fixups for this PHY */ - err =phy_init_hw (phydev); + err =phy_scan_fixups (phydev);if (err) {pr_err ("PHY %d failed to initialize\n" , phydev->addr); goto out;
drivers/net/ppp/pptp.c +1 -1
@@ -281,7 +281,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)nf_reset (skb); skb->ip_summed =CHECKSUM_NONE ; -ip_select_ident (skb, &rt->dst,NULL ); +ip_select_ident (skb,NULL );ip_send_check (iph);ip_local_out (skb);
drivers/sbus/char/bbc_envctrl.c +6 -0
@@ -452,6 +452,9 @@ static void attach_one_temp(struct bbc_i2c_bus *bp, struct platform_device *op,if (!tp)return ; +INIT_LIST_HEAD (&tp->bp_list); +INIT_LIST_HEAD (&tp->glob_list); + tp->client =bbc_i2c_attach (bp, op);if (!tp->client) {kfree (tp);
@@ -497,6 +500,9 @@ static void attach_one_fan(struct bbc_i2c_bus *bp, struct platform_device *op,if (!fp)return ; +INIT_LIST_HEAD (&fp->bp_list); +INIT_LIST_HEAD (&fp->glob_list); + fp->client =bbc_i2c_attach (bp, op);if (!fp->client) {kfree (fp);
drivers/sbus/char/bbc_i2c.c +8 -3
@@ -300,13 +300,18 @@ static struct bbc_i2c_bus * attach_one_i2c(struct platform_device *op, int indexif (!bp)return NULL ; +INIT_LIST_HEAD (&bp->temps); +INIT_LIST_HEAD (&bp->fans); + bp->i2c_control_regs =of_ioremap (&op->resource[0 ],0 ,0x2 ,"bbc_i2c_regs" );if (!bp->i2c_control_regs) goto fail; - bp->i2c_bussel_reg =of_ioremap (&op->resource[1 ],0 ,0x1 ,"bbc_i2c_bussel" ); -if (!bp->i2c_bussel_reg) - goto fail; +if (op->num_resources ==2 ) { + bp->i2c_bussel_reg =of_ioremap (&op->resource[1 ],0 ,0x1 ,"bbc_i2c_bussel" ); +if (!bp->i2c_bussel_reg) + goto fail; + } bp->waiting =0 ;init_waitqueue_head (&bp->wq);
drivers/tty/serial/sunsab.c +9 -0
@@ -157,6 +157,15 @@ receive_chars(struct uart_sunsab_port *up, (up->port.line == up->port.cons->index)) saw_console_brk =1 ; +if (count ==0 ) { +if (unlikely (stat->sreg.isr1 &SAB82532_ISR1_BRK )) { + stat->sreg.isr0 &= ~(SAB82532_ISR0_PERR | +SAB82532_ISR0_FERR ); + up->port.icount.brk++; +uart_handle_break (&up->port); + } + } +for (i =0 ; i < count; i++) {unsigned char ch = buf[i], flag;
fs/xfs/xfs_log.h +13 -6
@@ -24,7 +24,8 @@ struct xfs_log_vec {struct xfs_log_iovec *lv_iovecp;/* iovec array */ struct xfs_log_item *lv_item;/* owner */ char *lv_buf;/* formatted buffer */ -int lv_buf_len;/* size of formatted buffer */ +int lv_bytes;/* accounted space in buffer */ +int lv_buf_len;/* aligned size of buffer */ int lv_size;/* size of allocated lv */ };
@@ -52,15 +53,21 @@ xlog_prepare_iovec(struct xfs_log_vec *lv, struct xfs_log_iovec **vecp,return vec->i_addr; } +/* +* We need to make sure the next buffer is naturally aligned for the biggest +* basic data type we put into it. We already accounted for this padding when +* sizing the buffer. +* +* However, this padding does not get written into the log, and hence we have to +* track the space used by the log vectors separately to prevent log space hangs +* due to inaccurate accounting (i.e. a leak) of the used log space through the +* CIL context ticket. +*/ static inline void xlog_finish_iovec (struct xfs_log_vec *lv,struct xfs_log_iovec *vec,int len) { -/* -* We need to make sure the next buffer is naturally aligned for the -* biggest basic data type we put into it. We already accounted for -* this when sizing the buffer. -*/ lv->lv_buf_len +=round_up (len,sizeof (uint64_t )); + lv->lv_bytes += len; vec->i_len = len; }
fs/xfs/xfs_log_cil.c +4 -3
@@ -97,7 +97,7 @@ xfs_cil_prepare_item( {/* Account for the new LV being passed in */ if (lv->lv_buf_len !=XFS_LOG_VEC_ORDERED ) { - *diff_len += lv->lv_buf_len; + *diff_len += lv->lv_bytes; *diff_iovecs += lv->lv_niovecs; }
@@ -111,7 +111,7 @@ xfs_cil_prepare_item(else if (old_lv != lv) {ASSERT (lv->lv_buf_len !=XFS_LOG_VEC_ORDERED ); - *diff_len -= old_lv->lv_buf_len; + *diff_len -= old_lv->lv_bytes; *diff_iovecs -= old_lv->lv_niovecs;kmem_free (old_lv); }
@@ -239,7 +239,7 @@ xlog_cil_insert_format_items(* that the space reservation accounting is correct. */ *diff_iovecs -= lv->lv_niovecs; - *diff_len -= lv->lv_buf_len; + *diff_len -= lv->lv_bytes; }else {/* allocate new data chunk */ lv =kmem_zalloc (buf_size,KM_SLEEP |KM_NOFS );
@@ -259,6 +259,7 @@ xlog_cil_insert_format_items(/* The allocated data region lies beyond the iovec region */ lv->lv_buf_len =0 ; + lv->lv_bytes =0 ; lv->lv_buf = (char *)lv + buf_size - nbytes;ASSERT (IS_ALIGNED ((unsigned long )lv->lv_buf,sizeof (uint64_t )));
include/net/inetpeer.h +3 -13
@@ -41,14 +41,13 @@ struct inet_peer {struct rcu_head gc_rcu; };/* -* Once inet_peer is queued for deletion (refcnt == -1), following fields -* are not available: rid, ip_id_count +* Once inet_peer is queued for deletion (refcnt == -1), following field +* is not available: rid * We can share memory with rcu_head to help keep inet_peer small. */ union {struct {atomic_t rid;/* Frag reception counter */ -atomic_t ip_id_count;/* IP ID for the next packet */ };struct rcu_head rcu;struct inet_peer *gc_next;
@@ -165,7 +164,7 @@ bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);void inetpeer_invalidate_tree (struct inet_peer_base *);/* -* temporary check to make sure we dont access rid, ip_id_count, tcp_ts, +* temporary check to make sure we dont access rid, tcp_ts, * tcp_ts_stamp if no refcount is taken on inet_peer */ static inline void inet_peer_refcheck (const struct inet_peer *p)
@@ -173,13 +172,4 @@ static inline void inet_peer_refcheck(const struct inet_peer *p) WARN_ON_ONCE(atomic_read(&p->refcnt) <= 0); } - -/* can be called with or without local BH being disabled */ -static inline int inet_getid (struct inet_peer *p,int more) -{ - more++; -inet_peer_refcheck (p); -return atomic_add_return (more, &p->ip_id_count) - more; -} -#endif /* _NET_INETPEER_H */
include/net/ip.h +14 -17
@@ -297,9 +297,10 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb) } } -void __ip_select_ident (struct iphdr *iph,struct dst_entry *dst,int more); +u32 ip_idents_reserve (u32 hash,int segs); +void __ip_select_ident (struct iphdr *iph,int segs); -static inline void ip_select_ident (struct sk_buff *skb,struct dst_entry *dst,struct sock *sk) +static inline void ip_select_ident_segs (struct sk_buff *skb,struct sock *sk,int segs) {struct iphdr *iph =ip_hdr (skb);
@@ -309,24 +310,20 @@ static inline void ip_select_ident(struct sk_buff *skb, struct dst_entry *dst, s* does not change, they drop every other packet in * a TCP stream using header compression. */ - iph->id = (sk &&inet_sk (sk)->inet_daddr) ? -htons (inet_sk (sk)->inet_id++) :0 ; - }else -__ip_select_ident (iph, dst,0 ); -} - -static inline void ip_select_ident_more (struct sk_buff *skb,struct dst_entry *dst,struct sock *sk,int more) -{ -struct iphdr *iph =ip_hdr (skb); - -if ((iph->frag_off &htons (IP_DF )) && !skb->local_df) {if (sk &&inet_sk (sk)->inet_daddr) { iph->id =htons (inet_sk (sk)->inet_id); -inet_sk (sk)->inet_id +=1 + more; - }else +inet_sk (sk)->inet_id += segs; + }else { iph->id =0 ; - }else -__ip_select_ident (iph, dst, more); + } + }else { +__ip_select_ident (iph, segs); + } +} + +static inline void ip_select_ident (struct sk_buff *skb,struct sock *sk) +{ +ip_select_ident_segs (skb, sk,1 ); }/*
include/net/ip_tunnels.h +1 -0
@@ -40,6 +40,7 @@ struct ip_tunnel_prl_entry {struct ip_tunnel_dst {struct dst_entry __rcu *dst; +__be32 saddr; };struct ip_tunnel {
include/net/ipv6.h +0 -2
@@ -660,8 +660,6 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_addreturn __ipv6_addr_diff (a1, a2,sizeof (struct in6_addr )); } -void ipv6_select_ident (struct frag_hdr *fhdr,struct rt6_info *rt); -int ip6_dst_hoplimit (struct dst_entry *dst);/*
include/net/secure_seq.h +0 -2
@@ -3,8 +3,6 @@#include <linux/types.h> -__u32 secure_ip_id (__be32 daddr); -__u32 secure_ipv6_id (const __be32 daddr[4 ]);u32 secure_ipv4_port_ephemeral (__be32 saddr,__be32 daddr,__be16 dport);u32 secure_ipv6_port_ephemeral (const __be32 *saddr,const __be32 *daddr,__be16 dport);
net/batman-adv/fragmentation.c +7 -3
@@ -128,6 +128,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, {struct batadv_frag_table_entry *chain;struct batadv_frag_list_entry *frag_entry_new =NULL , *frag_entry_curr; +struct batadv_frag_list_entry *frag_entry_last =NULL ;struct batadv_frag_packet *frag_packet;uint8_t bucket;uint16_t seqno, hdr_size =sizeof (struct batadv_frag_packet );
@@ -180,11 +181,14 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, ret = true; goto out; } + +/* store current entry because it could be the last in list */ + frag_entry_last = frag_entry_curr; } -/* Reached the end of the list, so insert after 'frag_entry_curr'. */ -if (likely (frag_entry_curr)) { -hlist_add_after (&frag_entry_curr->list, &frag_entry_new->list); +/* Reached the end of the list, so insert after 'frag_entry_last'. */ +if (likely (frag_entry_last)) { +hlist_add_after (&frag_entry_last->list, &frag_entry_new->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; ret = true;
net/compat.c +5 -4
@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, {int tot_len; -if (kern_msg->msg_namelen) { +if (kern_msg->msg_name && kern_msg->msg_namelen) {if (mode ==VERIFY_READ ) { int err = move_addr_to_kernel(kern_msg->msg_name, kern_msg->msg_namelen,
@@ -93,10 +93,11 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,if (err <0 )return err; } -if (kern_msg->msg_name) - kern_msg->msg_name = kern_address; - }else + kern_msg->msg_name = kern_address; + }else { kern_msg->msg_name =NULL ; + kern_msg->msg_namelen =0 ; + } tot_len = iov_from_user_compat_to_kern(kern_iov, (struct compat_iovec __user *)kern_msg->msg_iov,
net/core/iovec.c +7 -3
@@ -39,7 +39,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a {int size, ct, err; -if (m->msg_namelen) { +if (m->msg_name && m->msg_namelen) {if (mode ==VERIFY_READ ) {void __user *namep; namep = (void __user __force *) m->msg_name;
@@ -48,10 +48,10 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *aif (err <0 )return err; } -if (m->msg_name) - m->msg_name = address; + m->msg_name = address; }else { m->msg_name =NULL ; + m->msg_namelen =0 ; } size = m->msg_iovlen *sizeof (struct iovec );
@@ -107,6 +107,10 @@ EXPORT_SYMBOL(memcpy_toiovecend);int memcpy_fromiovecend (unsigned char *kdata,const struct iovec *iov,int offset,int len) { +/* No data? Done! */ +if (len ==0 ) +return 0 ; +/* Skip over the finished iovecs */ while (offset >= iov->iov_len) { offset -= iov->iov_len;
net/core/secure_seq.c +0 -25
@@ -85,31 +85,6 @@ EXPORT_SYMBOL(secure_ipv6_port_ephemeral);#endif #ifdef CONFIG_INET -__u32 secure_ip_id (__be32 daddr) -{ -u32 hash[MD5_DIGEST_WORDS ]; - -net_secret_init (); - hash[0 ] = (__force __u32 ) daddr; - hash[1 ] = net_secret[13 ]; - hash[2 ] = net_secret[14 ]; - hash[3 ] = net_secret[15 ]; - -md5_transform (hash, net_secret); - -return hash[0 ]; -} - -__u32 secure_ipv6_id (const __be32 daddr[4 ]) -{ -__u32 hash[4 ]; - -net_secret_init (); -memcpy (hash, daddr,16 ); -md5_transform (hash, net_secret); - -return hash[0 ]; -}__u32 secure_tcp_sequence_number (__be32 saddr,__be32 daddr,__be16 sport,__be16 dport)
net/core/skbuff.c +1 -1
@@ -2968,9 +2968,9 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, tail = nskb;__copy_skb_header (nskb, head_skb); - nskb->mac_len = head_skb->mac_len;skb_headers_offset_update (nskb,skb_headroom (nskb) - headroom); +skb_reset_mac_len (nskb); skb_copy_from_linear_data_offset(head_skb, -tnl_hlen, nskb->data - tnl_hlen,
net/ipv4/igmp.c +2 -2
@@ -369,7 +369,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) pip->saddr = fl4.saddr; pip->protocol =IPPROTO_IGMP ; pip->tot_len =0 ;/* filled in later */ -ip_select_ident (skb, &rt->dst,NULL ); +ip_select_ident (skb,NULL ); ((u8 *)&pip[1 ])[0 ] =IPOPT_RA ; ((u8 *)&pip[1 ])[1 ] =4 ; ((u8 *)&pip[1 ])[2 ] =0 ;
@@ -714,7 +714,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, iph->daddr = dst; iph->saddr = fl4.saddr; iph->protocol =IPPROTO_IGMP ; -ip_select_ident (skb, &rt->dst,NULL ); +ip_select_ident (skb,NULL ); ((u8 *)&iph[1 ])[0 ] =IPOPT_RA ; ((u8 *)&iph[1 ])[1 ] =4 ; ((u8 *)&iph[1 ])[2 ] =0 ;
net/ipv4/inetpeer.c +0 -18
@@ -26,20 +26,7 @@* Theory of operations. * We keep one entry for each peer IP address. The nodes contains long-living * information about the peer which doesn't depend on routes. -* At this moment this information consists only of ID field for the next -* outgoing IP packet. This field is incremented with each packet as encoded -* in inet_getid() function (include/net/inetpeer.h). -* At the moment of writing this notes identifier of IP packets is generated -* to be unpredictable using this code only for packets subjected -* (actually or potentially) to defragmentation. I.e. DF packets less than -* PMTU in size when local fragmentation is disabled use a constant ID and do -* not use this code (see ip_select_ident() in include/net/ip.h). * -* Route cache entries hold references to our nodes. -* New cache entries get references via lookup by destination IP address in -* the avl tree. The reference is grabbed only when it's needed i.e. only -* when we try to output IP packet which needs an unpredictable ID (see -* __ip_select_ident() in net/ipv4/route.c). * Nodes are removed only when reference counter goes to 0. * When it's happened the node may be removed when a sufficient amount of * time has been passed since its last use. The less-recently-used entry can
@@ -62,7 +49,6 @@* refcnt: atomically against modifications on other CPU; * usually under some other lock to prevent node disappearing * daddr: unchangeable -* ip_id_count: atomic value (no lock needed) */ static struct kmem_cache *peer_cachep__read_mostly ;
@@ -497,10 +483,6 @@ relookup: p->daddr = *daddr;atomic_set (&p->refcnt,1 );atomic_set (&p->rid,0 ); -atomic_set (&p->ip_id_count, - (daddr->family ==AF_INET ) ? -secure_ip_id (daddr->addr.a4) : -secure_ipv6_id (daddr->addr.a6)); p->metrics[RTAX_LOCK -1 ] =INETPEER_METRICS_NEW ; p->rate_tokens =0 ;/* 60*HZ is arbitrary, but chosen enough high so that the first
net/ipv4/ip_output.c +3 -4
@@ -148,7 +148,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk, iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr); iph->saddr = saddr; iph->protocol = sk->sk_protocol; -ip_select_ident (skb, &rt->dst, sk); +ip_select_ident (skb, sk);if (opt && opt->opt.optlen) { iph->ihl += opt->opt.optlen>>2 ;
@@ -386,8 +386,7 @@ packet_routed:ip_options_build (skb, &inet_opt->opt, inet->inet_daddr, rt,0 ); } -ip_select_ident_more (skb, &rt->dst, sk, - (skb_shinfo (skb)->gso_segs ?:1 ) -1 ); +ip_select_ident_segs (skb, sk,skb_shinfo (skb)->gso_segs ?:1 ); skb->priority = sk->sk_priority; skb->mark = sk->sk_mark;
@@ -1338,7 +1337,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk, iph->ttl = ttl; iph->protocol = sk->sk_protocol;ip_copy_addrs (iph, fl4); -ip_select_ident (skb, &rt->dst, sk); +ip_select_ident (skb, sk);if (opt) { iph->ihl += opt->optlen>>2 ;
net/ipv4/ip_tunnel.c +18 -11
@@ -69,23 +69,25 @@ static unsigned int ip_tunnel_hash(__be32 key, __be32 remote) }static void __tunnel_dst_set (struct ip_tunnel_dst *idst, -struct dst_entry *dst) +struct dst_entry *dst,__be32 saddr) {struct dst_entry *old_dst;dst_clone (dst); old_dst =xchg ((__force struct dst_entry **)&idst->dst, dst);dst_release (old_dst); + idst->saddr = saddr; } -static void tunnel_dst_set (struct ip_tunnel *t,struct dst_entry *dst) +static void tunnel_dst_set (struct ip_tunnel *t, +struct dst_entry *dst,__be32 saddr) { -__tunnel_dst_set (this_cpu_ptr (t->dst_cache), dst); +__tunnel_dst_set (this_cpu_ptr (t->dst_cache), dst, saddr); }static void tunnel_dst_reset (struct ip_tunnel *t) { -tunnel_dst_set (t,NULL ); +tunnel_dst_set (t,NULL ,0 ); }void ip_tunnel_dst_reset_all (struct ip_tunnel *t)
@@ -93,20 +95,25 @@ void ip_tunnel_dst_reset_all(struct ip_tunnel *t)int i;for_each_possible_cpu (i) -__tunnel_dst_set (per_cpu_ptr (t->dst_cache, i),NULL ); +__tunnel_dst_set (per_cpu_ptr (t->dst_cache, i),NULL ,0 ); }EXPORT_SYMBOL (ip_tunnel_dst_reset_all); -static struct rtable *tunnel_rtable_get (struct ip_tunnel *t,u32 cookie) +static struct rtable *tunnel_rtable_get (struct ip_tunnel *t, +u32 cookie,__be32 *saddr) { +struct ip_tunnel_dst *idst;struct dst_entry *dst;rcu_read_lock (); - dst =rcu_dereference (this_cpu_ptr (t->dst_cache)->dst); + idst =this_cpu_ptr (t->dst_cache); + dst =rcu_dereference (idst->dst);if (dst && !atomic_inc_not_zero (&dst->__refcnt)) dst =NULL ;if (dst) { -if (dst->obsolete && dst->ops->check (dst, cookie) ==NULL ) { +if (!dst->obsolete || dst->ops->check (dst, cookie)) { + *saddr = idst->saddr; + }else {tunnel_dst_reset (t);dst_release (dst); dst =NULL ;
@@ -362,7 +369,7 @@ static int ip_tunnel_bind_dev(struct net_device *dev)if (!IS_ERR (rt)) { tdev = rt->dst.dev; -tunnel_dst_set (tunnel, &rt->dst); +tunnel_dst_set (tunnel, &rt->dst, fl4.saddr);ip_rt_put (rt); }if (dev->type !=ARPHRD_ETHER )
@@ -606,7 +613,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,init_tunnel_flow (&fl4, protocol, dst, tnl_params->saddr, tunnel->parms.o_key,RT_TOS (tos), tunnel->parms.link); - rt = connected ?tunnel_rtable_get (tunnel,0 ) :NULL ; + rt = connected ?tunnel_rtable_get (tunnel,0 , &fl4.saddr) :NULL ;if (!rt) { rt =ip_route_output_key (tunnel->net, &fl4);
@@ -616,7 +623,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, goto tx_error; }if (connected) -tunnel_dst_set (tunnel, &rt->dst); +tunnel_dst_set (tunnel, &rt->dst, fl4.saddr); }if (rt->dst.dev == dev) {
net/ipv4/ip_tunnel_core.c +1 -1
@@ -74,7 +74,7 @@ int iptunnel_xmit(struct rtable *rt, struct sk_buff *skb, iph->daddr = dst; iph->saddr = src; iph->ttl = ttl; -__ip_select_ident (iph, &rt->dst, (skb_shinfo (skb)->gso_segs ?:1 ) -1 ); +__ip_select_ident (iph,skb_shinfo (skb)->gso_segs ?:1 ); err =ip_local_out (skb);if (unlikely (net_xmit_eval (err)))
net/ipv4/ipmr.c +1 -1
@@ -1663,7 +1663,7 @@ static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr) iph->protocol =IPPROTO_IPIP ; iph->ihl =5 ; iph->tot_len =htons (skb->len); -ip_select_ident (skb,skb_dst (skb),NULL ); +ip_select_ident (skb,NULL );ip_send_check (iph);memset (&(IPCB (skb)->opt),0 ,sizeof (IPCB (skb)->opt));
net/ipv4/raw.c +1 -1
@@ -389,7 +389,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, iph->check =0 ; iph->tot_len =htons (length);if (!iph->id) -ip_select_ident (skb, &rt->dst,NULL ); +ip_select_ident (skb,NULL ); iph->check =ip_fast_csum ((unsigned char *)iph, iph->ihl); }
net/ipv4/route.c +38 -25
89 lines not on this page · raw message
net/ipv4/tcp_vegas.c +2 -1
@@ -219,7 +219,8 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 acked,* This is: * (actual rate in segments) * baseRTT */ - target_cwnd = tp->snd_cwnd * vegas->baseRTT / rtt; + target_cwnd = (u64 )tp->snd_cwnd * vegas->baseRTT; +do_div (target_cwnd, rtt);/* Calculate the difference between the window we had, * and the window we would like to have. This quantity
net/ipv4/tcp_veno.c +1 -1
@@ -145,7 +145,7 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 acked, rtt = veno->minrtt; - target_cwnd = (tp->snd_cwnd * veno->basertt); + target_cwnd = (u64 )tp->snd_cwnd * veno->basertt; target_cwnd <<=V_PARAM_SHIFT ;do_div (target_cwnd, rtt);
net/ipv4/xfrm4_mode_tunnel.c +1 -1
@@ -117,12 +117,12 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) top_iph->frag_off = (flags &XFRM_STATE_NOPMTUDISC ) ?0 : (XFRM_MODE_SKB_CB (skb)->frag_off &htons (IP_DF )); -ip_select_ident (skb, dst->child,NULL ); top_iph->ttl =ip4_dst_hoplimit (dst->child); top_iph->saddr = x->props.saddr.a4; top_iph->daddr = x->id.daddr.a4; +ip_select_ident (skb,NULL );return 0 ; }
net/ipv6/ip6_output.c +14 -0
@@ -537,6 +537,20 @@ static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from)skb_copy_secmark (to, from); } +static void ipv6_select_ident (struct frag_hdr *fhdr,struct rt6_info *rt) +{ +static u32 ip6_idents_hashrnd__read_mostly ; +u32 hash, id; + +net_get_random_once (&ip6_idents_hashrnd,sizeof (ip6_idents_hashrnd)); + + hash =__ipv6_addr_jhash (&rt->rt6i_dst.addr, ip6_idents_hashrnd); + hash =__ipv6_addr_jhash (&rt->rt6i_src.addr, hash); + + id =ip_idents_reserve (hash,1 ); + fhdr->identification =htonl (id); +} +int ip6_fragment (struct sk_buff *skb,int (*output)(struct sk_buff *)) {struct sk_buff *frag;
net/ipv6/output_core.c +0 -23
@@ -7,29 +7,6 @@#include <net/ip6_fib.h> #include <net/addrconf.h> -void ipv6_select_ident (struct frag_hdr *fhdr,struct rt6_info *rt) -{ -static atomic_t ipv6_fragmentation_id; -int ident; - -#if IS_ENABLED (CONFIG_IPV6 ) -if (rt && !(rt->dst.flags &DST_NOPEER )) { -struct inet_peer *peer; -struct net *net; - - net =dev_net (rt->dst.dev); - peer =inet_getpeer_v6 (net->ipv6.peers, &rt->rt6i_dst.addr,1 ); -if (peer) { - fhdr->identification =htonl (inet_getid (peer,0 )); -inet_putpeer (peer); -return ; - } - } -#endif - ident =atomic_inc_return (&ipv6_fragmentation_id); - fhdr->identification =htonl (ident); -} -EXPORT_SYMBOL (ipv6_select_ident);int ip6_find_1stfragopt (struct sk_buff *skb,u8 **nexthdr) {
net/netfilter/ipvs/ip_vs_xmit.c +1 -1
@@ -883,7 +883,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, iph->daddr = cp->daddr.ip; iph->saddr = saddr; iph->ttl = old_iph->ttl; -ip_select_ident (skb, &rt->dst,NULL ); +ip_select_ident (skb,NULL );/* Another hack: avoid icmp_send in ip_fragment */ skb->local_df =1 ;
net/sctp/associola.c +1 -0
@@ -1151,6 +1151,7 @@ void sctp_assoc_update(struct sctp_association *asoc, asoc->c = new->c; asoc->peer.rwnd = new->peer.rwnd; asoc->peer.sack_needed = new->peer.sack_needed; + asoc->peer.auth_capable = new->peer.auth_capable; asoc->peer.i = new->peer.i;sctp_tsnmap_init (&asoc->peer.tsn_map,SCTP_TSN_MAP_INITIAL , asoc->peer.i.initial_tsn,GFP_ATOMIC );
net/sctp/output.c +1 -1
@@ -599,7 +599,7 @@ out:return err; no_route:kfree_skb (nskb); -IP_INC_STATS_BH (sock_net (asoc->base.sk),IPSTATS_MIB_OUTNOROUTES ); +IP_INC_STATS (sock_net (asoc->base.sk),IPSTATS_MIB_OUTNOROUTES );/* FIXME: Returning the 'err' will effect all the associations * associated with a socket, although only one of the paths of the
net/xfrm/xfrm_user.c +3 -4
@@ -176,9 +176,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, attrs[XFRMA_ALG_AEAD ] || attrs[XFRMA_ALG_CRYPT ] || attrs[XFRMA_ALG_COMP ] || - attrs[XFRMA_TFCPAD ] || - (ntohl(p->id.spi) >= 0x10000)) - + attrs[XFRMA_TFCPAD]) goto out;break ;
@@ -206,7 +204,8 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, attrs[XFRMA_ALG_AUTH ] || attrs[XFRMA_ALG_AUTH_TRUNC ] || attrs[XFRMA_ALG_CRYPT ] || - attrs[XFRMA_TFCPAD]) + attrs[XFRMA_TFCPAD ] || + (ntohl(p->id.spi) >= 0x10000)) goto out;break ;