Linux 2.6.18.6
Subsystems (14)
We (the -stable team) are announcing the release of the 2.6.18.6 kernel. An assortment of important fixes with one security related fix that is associated with less common bluetooth hardware:
1dca7c28: Bluetooth: Add packet size checks for CAPI messages (CVE-2006-6106)
The diffstat and short summary of the fixes are below.
I'll also be replying to this message with a copy of the patch between 2.6.18.5 and 2.6.18.6, as it is small enough to do so.
The updated 2.6.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.18.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
-chris
--------
Makefile | 2 arch/arm/kernel/calls.S | 13 +++++ arch/m32r/kernel/entry.S | 65 +++++++++++--------------- arch/x86_64/kernel/setup.c | 5 +- drivers/ieee1394/ohci1394.c | 21 ++++++-- drivers/md/dm-crypt.c | 6 +- drivers/md/dm-snap.c | 1 drivers/media/dvb/frontends/lgdt330x.c | 6 -- drivers/media/video/tuner-simple.c | 2 drivers/media/video/tuner-types.c | 14 ----- drivers/net/bonding/bond_main.c | 2 drivers/net/forcedeth.c | 3 + drivers/net/sunhme.c | 5 ++ fs/compat.c | 2 include/asm-arm/unistd.h | 13 +++++ include/asm-m32r/ptrace.h | 28 +---------- include/asm-m32r/sigcontext.h | 13 ----- kernel/softirq.c | 2 net/bluetooth/cmtp/capi.c | 39 +++++++++++++-- net/bridge/netfilter/ebtables.c | 54 +++++++++++++-------- net/ieee80211/softmac/ieee80211softmac_scan.c | 2 net/ipv4/netfilter/ip_tables.c | 5 +- net/ipv4/route.c | 2 net/ipv4/xfrm4_policy.c | 2 net/irda/irttp.c | 4 - net/sched/act_gact.c | 4 - net/sched/act_police.c | 26 ++++++++-- 27 files changed, 199 insertions(+), 142 deletions(-)
Summary of changes from v2.6.18.5 to v2.6.18.6
============================================
Al Viro (4):
EBTABLES: Fix wraparounds in ebt_entries verification.
EBTABLES: Verify that ebt_entries have zero ->distinguisher.
EBTABLES: Deal with the worst-case behaviour in loop checks.
EBTABLES: Prevent wraparounds in checks for entry components' sizes.
Andrey Mirkin (1):
skip data conversion in compat_sys_mount when data_page is NULL
Andy Gospodarek (1):
bonding: incorrect bonding state reported via ioctl
Arjan van de Ven (1):
x86-64: Mark rdtsc as sync only for netburst, not for core2
Chris Wright (1):
Linux 2.6.18.6
Christophe Saout (1):
dm crypt: Fix data corruption with dm-crypt over RAID5
Daniel Barkalow (1):
forcedeth: Disable INTx when enabling MSI in forcedeth
David Miller (3):
PKT_SCHED act_gact: division by zero
XFRM: Use output device disable_xfrm for forwarded packets
IPSEC: Fix inetpeer leak in ipv4 xfrm dst entries.
Hans Verkuil (1):
V4L: Fix broken TUNER_LG_NTSC_TAPE radio support
Hirokazu Takata (1):
m32r: make userspace headers platform-independent
Jeet Chaudhuri (1):
IrDA: Incorrect TTP header reservation
Jurij Smakov (1):
SUNHME: Fix for sunhme failures on x86
Marcel Holtmann (1):
Bluetooth: Add packet size checks for CAPI messages (CVE-2006-6106)
Michael Buesch (1):
softmac: remove netif_tx_disable when scanning
Michael Krufky (1):
DVB: lgdt330x: fix signal / lock status detection bug
Milan Broz (1):
dm snapshot: fix freeing pending exception
Patrick McHardy (2):
NET_SCHED: policer: restore compatibility with old iproute binaries
NETFILTER: ip_tables: revision support for compat code
Russell King (1):
ARM: Add sys_*at syscalls
Stefan Richter (1):
ieee1394: ohci1394: add PPC_PMAC platform code to driver probe
Zachary Amsden (1):
softirq: remove BUG_ONs which can incorrectly trigger
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 18 -EXTRAVERSION = .5 +EXTRAVERSION = .6 NAME=Avast! A bilge rat! # *DOCUMENTATION*
arch/arm/kernel/calls.S +13 -0
@@ -331,6 +331,19 @@ CALL(sys_mbind) /* 320 */ CALL(sys_get_mempolicy) CALL(sys_set_mempolicy) + CALL(sys_openat) + CALL(sys_mkdirat) + CALL(sys_mknodat) +/* 325 */ CALL(sys_fchownat) + CALL(sys_futimesat) + CALL(sys_fstatat64) + CALL(sys_unlinkat) + CALL(sys_renameat) +/* 330 */ CALL(sys_linkat) + CALL(sys_symlinkat) + CALL(sys_readlinkat) + CALL(sys_fchmodat) + CALL(sys_faccessat) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls #define syscalls_counted
arch/m32r/kernel/entry.S +29 -36
81 lines not on this page · raw message
arch/x86_64/kernel/setup.c +4 -1
@@ -1010,7 +1010,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)if ((c->x86 ==0xf && c->x86_model >=0x03 ) || (c->x86 ==0x6 && c->x86_model >=0x0e ))set_bit (X86_FEATURE_CONSTANT_TSC , &c->x86_capability); -set_bit (X86_FEATURE_SYNC_RDTSC , &c->x86_capability); +if (c->x86 ==15 ) +set_bit (X86_FEATURE_SYNC_RDTSC , &c->x86_capability); +else +clear_bit (X86_FEATURE_SYNC_RDTSC , &c->x86_capability); c->x86_max_cores =intel_num_cpu_cores (c);srat_detect_node ();
drivers/ieee1394/ohci1394.c +16 -5
@@ -3218,6 +3218,19 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,struct ti_ohci *ohci;/* shortcut to currently handled device */ resource_size_t ohci_base; +#ifdef CONFIG_PPC_PMAC +/* Necessary on some machines if ohci1394 was loaded/ unloaded before */ +if (machine_is (powermac)) { +struct device_node *of_node =pci_device_to_OF_node (dev); + +if (of_node) { +pmac_call_feature (PMAC_FTR_1394_CABLE_POWER , of_node, +0 ,1 ); +pmac_call_feature (PMAC_FTR_1394_ENABLE , of_node,0 ,1 ); + } + } +#endif /* CONFIG_PPC_PMAC */ +if (pci_enable_device (dev))FAIL (-ENXIO ,"Failed to enable OHCI hardware" );pci_set_master (dev);
@@ -3506,11 +3519,9 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)#endif #ifdef CONFIG_PPC_PMAC -/* On UniNorth, power down the cable and turn off the chip -* clock when the module is removed to save power on -* laptops. Turning it back ON is done by the arch code when -* pci_enable_device() is called */ - { +/* On UniNorth, power down the cable and turn off the chip clock +* to save power on laptops */ +if (machine_is (powermac)) {struct device_node * of_node; of_node =pci_device_to_OF_node (ohci->dev);
drivers/md/dm-crypt.c +4 -2
@@ -717,13 +717,15 @@ static int crypt_endio(struct bio *bio, unsigned int done, int error)if (bio->bi_size)return 1 ; +if (!bio_flagged (bio,BIO_UPTODATE ) && !error) + error = -EIO ; +bio_put (bio);/* * successful reads are decrypted by the worker thread */ -if ((bio_data_dir (bio) ==READ ) - &&bio_flagged (bio,BIO_UPTODATE )) { +if (bio_data_dir (io->bio) ==READ && !error) {kcryptd_queue_io (io);return 0 ; }
drivers/md/dm-snap.c +1 -0
@@ -691,6 +691,7 @@ static void pending_complete(struct pending_exception *pe, int success)free_exception (e); +remove_exception (&pe->e);error_snapshot_bios (pe); goto out; }
drivers/media/dvb/frontends/lgdt330x.c +0 -6
@@ -435,9 +435,6 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)/* Test signal does not exist flag */ /* as well as the AGC lock flag. */ *status |=FE_HAS_SIGNAL ; - }else { -/* Without a signal all other status bits are meaningless */ -return 0 ; }/*
@@ -500,9 +497,6 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)/* Test input signal does not exist flag */ /* as well as the AGC lock flag. */ *status |=FE_HAS_SIGNAL ; - }else { -/* Without a signal all other status bits are meaningless */ -return 0 ; }/* Carrier Recovery Lock Status Register */
drivers/media/video/tuner-simple.c +2 -0
@@ -108,6 +108,7 @@ static int tuner_stereo(struct i2c_client *c)case TUNER_PHILIPS_FM1216ME_MK3 :case TUNER_PHILIPS_FM1236_MK3 :case TUNER_PHILIPS_FM1256_IH3 : +case TUNER_LG_NTSC_TAPE : stereo = ((status &TUNER_SIGNAL ) ==TUNER_STEREO_MK3 );break ;default :
@@ -419,6 +420,7 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)case TUNER_PHILIPS_FM1216ME_MK3 :case TUNER_PHILIPS_FM1236_MK3 :case TUNER_PHILIPS_FMD1216ME_MK3 : +case TUNER_LG_NTSC_TAPE : buffer[3 ] =0x19 ;break ;case TUNER_TNF_5335MF :
drivers/media/video/tuner-types.c +2 -12
@@ -671,16 +671,6 @@ static struct tuner_params tuner_panasonic_vp27_params[] = { }, }; -/* ------------ TUNER_LG_NTSC_TAPE - LGINNOTEK NTSC ------------ */ - -static struct tuner_params tuner_lg_ntsc_tape_params[] = { - { - .type =TUNER_PARAM_TYPE_NTSC , - .ranges = tuner_fm1236_mk3_ntsc_ranges, - .count =ARRAY_SIZE (tuner_fm1236_mk3_ntsc_ranges), - }, -}; -/* ------------ TUNER_TNF_8831BGFF - Philips PAL ------------ */ static struct tuner_range tuner_tnf_8831bgff_pal_ranges[] = {
@@ -1331,8 +1321,8 @@ struct tunertype tuners[] = { }, [TUNER_LG_NTSC_TAPE] = { /* LGINNOTEK NTSC */ .name = "LG NTSC (TAPE series)", - .params = tuner_lg_ntsc_tape_params, - .count = ARRAY_SIZE(tuner_lg_ntsc_tape_params), + .params = tuner_fm1236_mk3_params, + .count = ARRAY_SIZE(tuner_fm1236_mk3_params), }, [TUNER_TNF_8831BGFF] = { /* Philips PAL */ .name = "Tenna TNF 8831 BGFF)",
drivers/net/bonding/bond_main.c +1 -1
@@ -3547,7 +3547,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd mii->val_out =0 ;read_lock_bh (&bond->lock);read_lock (&bond->curr_slave_lock); -if (bond->curr_active_slave) { +if (netif_carrier_ok (bond->dev)) { mii->val_out =BMSR_LSTATUS ; }read_unlock (&bond->curr_slave_lock);
drivers/net/forcedeth.c +3 -0
@@ -2692,11 +2692,13 @@ static int nv_request_irq(struct net_device *dev, int intr_test) }if (ret !=0 && np->msi_flags &NV_MSI_CAPABLE ) {if ((ret =pci_enable_msi (np->pci_dev)) ==0 ) { +pci_intx (np->pci_dev,0 ); np->msi_flags |=NV_MSI_ENABLED ;if ((!intr_test &&request_irq (np->pci_dev->irq, &nv_nic_irq,IRQF_SHARED , dev->name, dev) !=0 ) || (intr_test &&request_irq (np->pci_dev->irq, &nv_nic_irq_test,IRQF_SHARED , dev->name, dev) !=0 )) {printk (KERN_INFO "forcedeth: request_irq failed %d\n" , ret);pci_disable_msi (np->pci_dev); +pci_intx (np->pci_dev,1 ); np->msi_flags &= ~NV_MSI_ENABLED ; goto out_err; }
@@ -2739,6 +2741,7 @@ static void nv_free_irq(struct net_device *dev)free_irq (np->pci_dev->irq, dev);if (np->msi_flags &NV_MSI_ENABLED ) {pci_disable_msi (np->pci_dev); +pci_intx (np->pci_dev,1 ); np->msi_flags &= ~NV_MSI_ENABLED ; } }
drivers/net/sunhme.c +5 -0
@@ -3012,6 +3012,11 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,#endif err = -ENODEV ; + +if (pci_enable_device (pdev)) + goto err_out; +pci_set_master (pdev); +if (!strcmp (prom_name,"SUNW,qfe" ) || !strcmp (prom_name,"qfe" )) { qp =quattro_pci_find (pdev);if (qp ==NULL )
fs/compat.c +1 -1
@@ -873,7 +873,7 @@ asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name, retval = -EINVAL ; -if (type_page) { +if (type_page && data_page) {if (!strcmp ((char *)type_page,SMBFS_NAME )) {do_smb_super_data_conv ((void *)data_page); }else if (!strcmp ((char *)type_page,NCPFS_NAME )) {
include/asm-arm/unistd.h +13 -0
@@ -347,6 +347,19 @@#define __NR_mbind (__NR_SYSCALL_BASE+319)#define __NR_get_mempolicy (__NR_SYSCALL_BASE+320)#define __NR_set_mempolicy (__NR_SYSCALL_BASE+321) +#define __NR_openat (__NR_SYSCALL_BASE+322) +#define __NR_mkdirat (__NR_SYSCALL_BASE+323) +#define __NR_mknodat (__NR_SYSCALL_BASE+324) +#define __NR_fchownat (__NR_SYSCALL_BASE+325) +#define __NR_futimesat (__NR_SYSCALL_BASE+326) +#define __NR_fstatat64 (__NR_SYSCALL_BASE+327) +#define __NR_unlinkat (__NR_SYSCALL_BASE+328) +#define __NR_renameat (__NR_SYSCALL_BASE+329) +#define __NR_linkat (__NR_SYSCALL_BASE+330) +#define __NR_symlinkat (__NR_SYSCALL_BASE+331) +#define __NR_readlinkat (__NR_SYSCALL_BASE+332) +#define __NR_fchmodat (__NR_SYSCALL_BASE+333) +#define __NR_faccessat (__NR_SYSCALL_BASE+334)/* * The following SWIs are ARM private.
include/asm-m32r/ptrace.h +4 -24
@@ -33,21 +33,10 @@#define PT_R15 PT_SP/* processor status and miscellaneous context registers. */ -#if defined(CONFIG_ISA_M32R2 ) && defined(CONFIG_ISA_DSP_LEVEL2 )#define PT_ACC0H 15#define PT_ACC0L 16 -#define PT_ACC1H 17 -#define PT_ACC1L 18 -#define PT_ACCH PT_ACC0H -#define PT_ACCL PT_ACC0L -#elif defined(CONFIG_ISA_M32R2 ) || defined(CONFIG_ISA_M32R ) -#define PT_ACCH 15 -#define PT_ACCL 16 -#define PT_DUMMY_ACC1H 17 -#define PT_DUMMY_ACC1L 18 -#else -#error unknown isa conifiguration -#endif +#define PT_ACC1H 17/* ISA_DSP_LEVEL2 only */ +#define PT_ACC1L 18/* ISA_DSP_LEVEL2 only */ #define PT_PSW 19#define PT_BPC 20#define PT_BBPSW 21
@@ -103,19 +92,10 @@ struct pt_regs {long syscall_nr;/* Saved main processor status and miscellaneous context registers. */ -#if defined(CONFIG_ISA_M32R2 ) && defined(CONFIG_ISA_DSP_LEVEL2 )unsigned long acc0h;unsigned long acc0l; -unsigned long acc1h; -unsigned long acc1l; -#elif defined(CONFIG_ISA_M32R2 ) || defined(CONFIG_ISA_M32R ) -unsigned long acch; -unsigned long accl; -unsigned long dummy_acc1h; -unsigned long dummy_acc1l; -#else -#error unknown isa configuration -#endif +unsigned long acc1h;/* ISA_DSP_LEVEL2 only */ +unsigned long acc1l;/* ISA_DSP_LEVEL2 only */ unsigned long psw;unsigned long bpc;/* saved PC for TRAP syscalls */ unsigned long bbpsw;
include/asm-m32r/sigcontext.h +2 -11
@@ -23,19 +23,10 @@ struct sigcontext {unsigned long sc_r12;/* Saved main processor status and miscellaneous context registers. */ -#if defined(CONFIG_ISA_M32R2 ) && defined(CONFIG_ISA_DSP_LEVEL2 )unsigned long sc_acc0h;unsigned long sc_acc0l; -unsigned long sc_acc1h; -unsigned long sc_acc1l; -#elif defined(CONFIG_ISA_M32R2 ) || defined(CONFIG_ISA_M32R ) -unsigned long sc_acch; -unsigned long sc_accl; -unsigned long sc_dummy_acc1h; -unsigned long sc_dummy_acc1l; -#else -#error unknown isa configuration -#endif +unsigned long sc_acc1h;/* ISA_DSP_LEVEL2 only */ +unsigned long sc_acc1l;/* ISA_DSP_LEVEL2 only */ unsigned long sc_psw;unsigned long sc_bpc;/* saved PC for TRAP syscalls */ unsigned long sc_bbpsw;
kernel/softirq.c +0 -2
@@ -574,8 +574,6 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,switch (action) {case CPU_UP_PREPARE : -BUG_ON (per_cpu (tasklet_vec, hotcpu).list); -BUG_ON (per_cpu (tasklet_hi_vec, hotcpu).list); p =kthread_create (ksoftirqd, hcpu,"ksoftirqd/%d" , hotcpu);if (IS_ERR (p)) {printk ("ksoftirqd for %i failed\n" , hotcpu);
net/bluetooth/cmtp/capi.c +33 -6
@@ -196,6 +196,9 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *sswitch (CAPIMSG_SUBCOMMAND (skb->data)) {case CAPI_CONF : +if (skb->len <CAPI_MSG_BASELEN +10 ) +break ; + func =CAPIMSG_U16 (skb->data,CAPI_MSG_BASELEN +5 ); info =CAPIMSG_U16 (skb->data,CAPI_MSG_BASELEN +8 );
@@ -226,6 +229,9 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *sbreak ;case CAPI_FUNCTION_GET_PROFILE : +if (skb->len <CAPI_MSG_BASELEN +11 +sizeof (capi_profile)) +break ; + controller =CAPIMSG_U16 (skb->data,CAPI_MSG_BASELEN +11 ); msgnum =CAPIMSG_MSGID (skb->data);
@@ -246,17 +252,26 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *sbreak ;case CAPI_FUNCTION_GET_MANUFACTURER : +if (skb->len <CAPI_MSG_BASELEN +15 ) +break ; + controller =CAPIMSG_U32 (skb->data,CAPI_MSG_BASELEN +10 );if (!info && ctrl) { +int len =min_t (uint,CAPI_MANUFACTURER_LEN , + skb->data[CAPI_MSG_BASELEN +14 ]); + +memset (ctrl->manu,0 ,CAPI_MANUFACTURER_LEN );strncpy (ctrl->manu, - skb->data +CAPI_MSG_BASELEN +15 , - skb->data[CAPI_MSG_BASELEN +14 ]); + skb->data +CAPI_MSG_BASELEN +15 , len); }break ;case CAPI_FUNCTION_GET_VERSION : +if (skb->len <CAPI_MSG_BASELEN +32 ) +break ; + controller =CAPIMSG_U32 (skb->data,CAPI_MSG_BASELEN +12 );if (!info && ctrl) {
@@ -269,13 +284,18 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *sbreak ;case CAPI_FUNCTION_GET_SERIAL_NUMBER : +if (skb->len <CAPI_MSG_BASELEN +17 ) +break ; + controller =CAPIMSG_U32 (skb->data,CAPI_MSG_BASELEN +12 );if (!info && ctrl) { +int len =min_t (uint,CAPI_SERIAL_LEN , + skb->data[CAPI_MSG_BASELEN +16 ]); +memset (ctrl->serial,0 ,CAPI_SERIAL_LEN );strncpy (ctrl->serial, - skb->data +CAPI_MSG_BASELEN +17 , - skb->data[CAPI_MSG_BASELEN +16 ]); + skb->data +CAPI_MSG_BASELEN +17 , len); }break ;
@@ -284,14 +304,18 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *sbreak ;case CAPI_IND : +if (skb->len <CAPI_MSG_BASELEN +6 ) +break ; + func =CAPIMSG_U16 (skb->data,CAPI_MSG_BASELEN +3 );if (func ==CAPI_FUNCTION_LOOPBACK ) { +int len =min_t (uint, skb->len -CAPI_MSG_BASELEN -6 , + skb->data[CAPI_MSG_BASELEN +5 ]); appl =CAPIMSG_APPID (skb->data); msgnum =CAPIMSG_MSGID (skb->data);cmtp_send_interopmsg (session,CAPI_RESP , appl, msgnum, func, - skb->data +CAPI_MSG_BASELEN +6 , - skb->data[CAPI_MSG_BASELEN +5 ]); + skb->data +CAPI_MSG_BASELEN +6 , len); }break ;
@@ -309,6 +333,9 @@ void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb)BT_DBG ("session %p skb %p len %d" , session, skb, skb->len); +if (skb->len <CAPI_MSG_BASELEN ) +return ; +if (CAPIMSG_COMMAND (skb->data) ==CAPI_INTEROPERABILITY ) {cmtp_recv_interopmsg (session, skb);return ;
net/bridge/netfilter/ebtables.c +33 -21
153 lines not on this page · raw message
net/ieee80211/softmac/ieee80211softmac_scan.c +0 -2
@@ -47,7 +47,6 @@ ieee80211softmac_start_scan(struct ieee80211softmac_device *sm) sm->scanning =1 ;spin_unlock_irqrestore (&sm->lock, flags); -netif_tx_disable (sm->ieee->dev); ret = sm->start_scan (sm->dev);if (ret) {spin_lock_irqsave (&sm->lock, flags);
@@ -248,7 +247,6 @@ void ieee80211softmac_scan_finished(struct ieee80211softmac_device *sm)if (net) sm->set_channel (sm->dev, net->channel); } -netif_wake_queue (sm->ieee->dev);ieee80211softmac_call_events (sm,IEEE80211SOFTMAC_EVENT_SCAN_FINISHED ,NULL ); }EXPORT_SYMBOL_GPL (ieee80211softmac_scan_finished);
net/ipv4/netfilter/ip_tables.c +3 -2
@@ -1989,6 +1989,8 @@ compat_get_entries(struct compat_ipt_get_entries __user *uptr, int *len)return ret; } +static int do_ipt_get_ctl (struct sock *,int ,void __user *,int *); +static int compat_do_ipt_get_ctl (struct sock *sk,int cmd,void __user *user,int *len) {
@@ -2005,8 +2007,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) ret =compat_get_entries (user, len);break ;default : -duprintf ("compat_do_ipt_get_ctl: unknown request %i\n" , cmd); - ret = -EINVAL ; + ret =do_ipt_get_ctl (sk, cmd, user, len); }return ret; }
net/ipv4/route.c +1 -1
@@ -1775,7 +1775,7 @@ static inline int __mkroute_input(struct sk_buff *skb,#endif if (in_dev->cnf.no_policy) rth->u.dst.flags |=DST_NOPOLICY ; -if (in_dev->cnf.no_xfrm) +if (out_dev->cnf.no_xfrm) rth->u.dst.flags |=DST_NOXFRM ; rth->fl.fl4_dst = daddr; rth->rt_dst = daddr;
net/ipv4/xfrm4_policy.c +2 -0
@@ -252,6 +252,8 @@ static void xfrm4_dst_destroy(struct dst_entry *dst)if (likely (xdst->u.rt.idev))in_dev_put (xdst->u.rt.idev); +if (likely (xdst->u.rt.peer)) +inet_putpeer (xdst->u.rt.peer);xfrm_dst_destroy (xdst); }
net/irda/irttp.c +2 -2
@@ -1098,7 +1098,7 @@ int irttp_connect_request(struct tsap_cb *self, __u8 dtsap_sel,return -ENOMEM ;/* Reserve space for MUX_CONTROL and LAP header */ -skb_reserve (tx_skb,TTP_MAX_HEADER ); +skb_reserve (tx_skb,TTP_MAX_HEADER +TTP_SAR_HEADER ); }else { tx_skb = userdata;/*
@@ -1346,7 +1346,7 @@ int irttp_connect_response(struct tsap_cb *self, __u32 max_sdu_size,return -ENOMEM ;/* Reserve space for MUX_CONTROL and LAP header */ -skb_reserve (tx_skb,TTP_MAX_HEADER ); +skb_reserve (tx_skb,TTP_MAX_HEADER +TTP_SAR_HEADER ); }else { tx_skb = userdata;/*
net/sched/act_gact.c +2 -2
@@ -54,14 +54,14 @@ static DEFINE_RWLOCK(gact_lock);#ifdef CONFIG_GACT_PROB static int gact_net_rand (struct tcf_gact *p) { -if (net_random ()%p->pval) +if (!p->pval ||net_random ()%p->pval)return p->action;return p->paction; }static int gact_determ (struct tcf_gact *p) { -if (p->bstats.packets%p->pval) +if (!p->pval || p->bstats.packets%p->pval)return p->action;return p->paction; }
net/sched/act_police.c +22 -4
@@ -44,6 +44,18 @@ static struct tcf_police *tcf_police_ht[MY_TAB_SIZE];/* Policer hash table lock */ static DEFINE_RWLOCK (police_lock); +/* old policer structure from before tc actions */ +struct tc_police_compat +{ +u32 index; +int action; +u32 limit; +u32 burst; +u32 mtu; +struct tc_ratespec rate; +struct tc_ratespec peakrate; +}; +/* Each policer is serialized by its individual spinlock */ static __inline__unsigned tcf_police_hash (u32 index)
@@ -169,12 +181,15 @@ static int tcf_act_police_locate(struct rtattr *rta, struct rtattr *est,struct tc_police *parm;struct tcf_police *p;struct qdisc_rate_table *R_tab =NULL , *P_tab =NULL ; +int size;if (rta ==NULL ||rtattr_parse_nested (tb,TCA_POLICE_MAX , rta) <0 )return -EINVAL ; -if (tb[TCA_POLICE_TBF -1 ] ==NULL || -RTA_PAYLOAD (tb[TCA_POLICE_TBF -1 ]) !=sizeof (*parm)) +if (tb[TCA_POLICE_TBF -1 ] ==NULL ) +return -EINVAL ; + size =RTA_PAYLOAD (tb[TCA_POLICE_TBF -1 ]); +if (size !=sizeof (*parm) && size !=sizeof (struct tc_police_compat ))return -EINVAL ; parm =RTA_DATA (tb[TCA_POLICE_TBF -1 ]);
@@ -413,12 +428,15 @@ struct tcf_police * tcf_police_locate(struct rtattr *rta, struct rtattr *est)struct tcf_police *p;struct rtattr *tb[TCA_POLICE_MAX ];struct tc_police *parm; +int size;if (rtattr_parse_nested (tb,TCA_POLICE_MAX , rta) <0 )return NULL ; -if (tb[TCA_POLICE_TBF -1 ] ==NULL || -RTA_PAYLOAD (tb[TCA_POLICE_TBF -1 ]) !=sizeof (*parm)) +if (tb[TCA_POLICE_TBF -1 ] ==NULL ) +return NULL ; + size =RTA_PAYLOAD (tb[TCA_POLICE_TBF -1 ]); +if (size !=sizeof (*parm) && size !=sizeof (struct tc_police_compat ))return NULL ; parm =RTA_DATA (tb[TCA_POLICE_TBF -1 ]);