Linux 2.6.19.1
Subsystems (18)
We (the -stable team) are announcing the release of the 2.6.19.1 kernel. It's an assortment of fixes with a couple security related:
a526d58e: do_coredump() and not stopping rewrite attacks? (CVE-2006-6304)ad8ca99c: TOKENRING: Remote memory corruptor in ibmtr.c
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.19 and 2.6.19.1, as it is small enough to do so.
The updated 2.6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.19.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
-chris
--------
Makefile | 2 arch/i386/kernel/acpi/boot.c | 10 - arch/i386/kernel/nmi.c | 8 - arch/m32r/kernel/entry.S | 65 +++++------ arch/x86_64/kernel/nmi.c | 9 - drivers/block/Kconfig | 1 drivers/char/drm/drm_sman.c | 1 drivers/infiniband/core/ucm.c | 2 drivers/net/forcedeth.c | 3 drivers/net/sunhme.c | 5 drivers/net/tokenring/ibmtr.c | 2 drivers/usb/misc/phidgetservo.c | 1 fs/autofs/inode.c | 7 - fs/autofs4/inode.c | 7 - fs/compat.c | 2 fs/exec.c | 3 include/asm-m32r/ptrace.h | 28 ----- include/asm-m32r/sigcontext.h | 13 -- include/linux/bottom_half.h | 5 include/linux/if_addr.h | 6 + include/linux/if_link.h | 6 + include/linux/interrupt.h | 7 - include/linux/rtnetlink.h | 2 include/linux/spinlock.h | 1 kernel/power/disk.c | 2 kernel/softirq.c | 2 net/bridge/br_netfilter.c | 36 +++++- net/bridge/netfilter/ebtables.c | 54 +++++---- net/ieee80211/softmac/ieee80211softmac_scan.c | 2 net/ieee80211/softmac/ieee80211softmac_wx.c | 3 net/ipv4/netfilter/arp_tables.c | 48 ++++---- net/ipv4/netfilter/ip_tables.c | 144 +++++++++++++------------- net/ipv4/route.c | 2 net/ipv4/xfrm4_policy.c | 2 net/ipv6/ndisc.c | 16 ++ net/ipv6/netfilter/ip6_tables.c | 59 ++++------ net/irda/irttp.c | 4 net/sched/act_gact.c | 4 net/sched/act_police.c | 26 +++- 39 files changed, 323 insertions(+), 277 deletions(-)
Summary of changes from v2.6.19 to v2.6.19.1
============================================
Al Viro (5):
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.
TOKENRING: Remote memory corruptor in ibmtr.c
Alexey Dobriyan (1):
do_coredump() and not stopping rewrite attacks? (CVE-2006-6304)
Andrew Morton (2):
add bottom_half.h
drm-sis linkage fix
Andrey Mirkin (1):
compat: skip data conversion in compat_sys_mount when data_page is NULL
Bart De Schuymer (1):
NETFILTER: bridge netfilter: deal with martians correctly
Chris Wright (1):
Linux 2.6.19.1
Daniel Barkalow (1):
forcedeth: Disable INTx when enabling MSI in forcedeth
David Miller (4):
IPV6 NDISC: Calculate packet length correctly for allocation. PKT_SCHED act_gact: division by zero
IPSEC: Fix inetpeer leak in ipv4 xfrm dst entries.
NETLINK: Put {IFA,IFLA}_{RTA,PAYLOAD} macros back for userspace.
Dmitry Mishin (2):
NETFILTER: Fix {ip, ip6, arp}_tables hook validation
NETFILTER: Fix iptables compat hook validation
Herbert Xu (1):
cryptoloop: Select CRYPTO_CBC
Hirokazu Takata (1):
m32r: make userspace headers platform-independent
Jeet Chaudhuri (1):
IrDA: Incorrect TTP header reservation
Jiri Kosina (1):
autofs: fix error code path in autofs_fill_sb()
Jurij Smakov (1):
SUNHME: Fix for sunhme failures on x86
Len Brown (1):
Revert "ACPI: SCI interrupt source override"
Maxime Austruy (1):
softmac: fix unbalanced mutex_lock/unlock in ieee80211softmac_wx_set_mlme
Michael Buesch (1):
softmac: remove netif_tx_disable when scanning
Michael S Tsirkin (1):
IB/ucm: Fix deadlock in cleanup
Patrick McHardy (2):
NET_SCHED: policer: restore compatibility with old iproute binaries
XFRM: Use output device disable_xfrm for forwarded packets
Rafael J Wysocki (1):
PM: Fix swsusp debug mode testproc
Ravikiran G Thirumalai (1):
x86: Fix boot hang due to nmi watchdog init code
Sean Young (1):
USB: Fix oops in PhidgetServo
Thomas Graf (1):
NETLINK: Restore API compatibility of address and neighbour bits
Zachary Amsden (1):
softirq: remove BUG_ONs which can incorrectly trigger
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 19 -EXTRAVERSION = +EXTRAVERSION = .1 NAME=Avast! A bilge rat! # *DOCUMENTATION*
arch/i386/kernel/acpi/boot.c +5 -5
@@ -333,7 +333,7 @@ acpi_parse_ioapic(acpi_table_entry_heade/* * Parse Interrupt Source Override for the ACPI SCI */ -static void acpi_sci_ioapic_setup (u32 bus_irq,u32 gsi,u16 polarity,u16 trigger) +static void acpi_sci_ioapic_setup (u32 gsi,u16 polarity,u16 trigger) {if (trigger ==0 )/* compatible SCI trigger is level */ trigger =3 ;
@@ -353,13 +353,13 @@ static void acpi_sci_ioapic_setup(u32 bu* If GSI is < 16, this will update its flags, * else it will create a new mp_irqs[] entry. */ -mp_override_legacy_irq (bus_irq, polarity, trigger, gsi); +mp_override_legacy_irq (gsi, polarity, trigger, gsi);/* * stash over-ride to indicate we've been here * and for later update of acpi_fadt */ - acpi_sci_override_gsi = bus_irq; + acpi_sci_override_gsi = gsi;return ; }
@@ -377,7 +377,7 @@ acpi_parse_int_src_ovr(acpi_table_entry_acpi_table_print_madt_entry (header);if (intsrc->bus_irq == acpi_fadt.sci_int) { -acpi_sci_ioapic_setup (intsrc->bus_irq, intsrc->global_irq, +acpi_sci_ioapic_setup (intsrc->global_irq, intsrc->flags.polarity, intsrc->flags.trigger);return 0 ;
@@ -880,7 +880,7 @@ static int __init acpi_parse_madt_ioapic* pretend we got one so we can set the SCI flags. */ if (!acpi_sci_override_gsi) -acpi_sci_ioapic_setup (acpi_fadt.sci_int, acpi_fadt.sci_int,0 ,0 ); +acpi_sci_ioapic_setup (acpi_fadt.sci_int,0 ,0 );/* Fill in identity legacy mapings where no override */ mp_config_acpi_legacy_irqs ();
arch/i386/kernel/nmi.c +4 -4
@@ -192,6 +192,8 @@ static __cpuinit inline int nmi_known_cpreturn 0 ; } +static int endflag__initdata =0 ; +#ifdef CONFIG_SMP /* The performance counters used by NMI_LOCAL_APIC don't trigger when * the CPU is idle. To make sure the NMI watchdog really ticks on all
@@ -199,7 +201,6 @@ #ifdef CONFIG_SMP*/ static __init void nmi_cpu_busy (void *data) { -volatile int *endflag = data;local_irq_enable_in_hardirq ();/* Intentionally don't use cpu_relax here. This is to make sure that the performance counter really ticks,
@@ -207,14 +208,13 @@ static __init void nmi_cpu_busy(void *dapause instruction. On a real HT machine this is fine because all other CPUs are busy with "useless" delay loops and don't care if they get somewhat less cycles. */ -while (*endflag ==0 ) - barrier(); +while (endflag ==0 ) + mb(); }#endif static int __init check_nmi_watchdog (void ) { -volatile int endflag =0 ;unsigned int *prev_nmi_count;int cpu;
arch/m32r/kernel/entry.S +29 -36
81 lines not on this page · raw message
arch/x86_64/kernel/nmi.c +5 -4
@@ -190,6 +190,8 @@ void nmi_watchdog_default(void) nmi_watchdog =NMI_IO_APIC ; } +static int endflag__initdata =0 ; +#ifdef CONFIG_SMP /* The performance counters used by NMI_LOCAL_APIC don't trigger when * the CPU is idle. To make sure the NMI watchdog really ticks on all
@@ -197,7 +199,6 @@ #ifdef CONFIG_SMP*/ static __init void nmi_cpu_busy (void *data) { -volatile int *endflag = data;local_irq_enable_in_hardirq ();/* Intentionally don't use cpu_relax here. This is to make sure that the performance counter really ticks,
@@ -205,14 +206,13 @@ static __init void nmi_cpu_busy(void *dapause instruction. On a real HT machine this is fine because all other CPUs are busy with "useless" delay loops and don't care if they get somewhat less cycles. */ -while (*endflag ==0 ) - barrier(); +while (endflag ==0 ) + mb(); }#endif int __init check_nmi_watchdog (void ) { -volatile int endflag =0 ;int *counts;int cpu;
@@ -253,6 +253,7 @@ #endifif (!atomic_read (&nmi_active)) {kfree (counts);atomic_set (&nmi_active,-1 ); + endflag =1 ;return -1 ; } endflag =1 ;
drivers/block/Kconfig +1 -0
@@ -305,6 +305,7 @@ config BLK_DEV_LOOP config BLK_DEV_CRYPTOLOOP tristate "Cryptoloop Support" select CRYPTO + select CRYPTO_CBC depends on BLK_DEV_LOOP ---help--- Say Y here if you want to be able to use the ciphers that are
drivers/char/drm/drm_sman.c +1 -0
@@ -162,6 +162,7 @@ drm_sman_set_manager(drm_sman_t * sman,return 0 ; } +EXPORT_SYMBOL (drm_sman_set_manager);static drm_owner_item_t *drm_sman_get_owner_item (drm_sman_t * sman,unsigned long owner)
drivers/infiniband/core/ucm.c +2 -0
@@ -161,12 +161,14 @@ static void ib_ucm_cleanup_events(struct struct ib_ucm_event, ctx_list);list_del (&uevent->file_list);list_del (&uevent->ctx_list); +mutex_unlock (&ctx->file->file_mutex);/* clear incoming connections. */ if (ib_ucm_new_cm_id (uevent->resp.event))ib_destroy_cm_id (uevent->cm_id);kfree (uevent); +mutex_lock (&ctx->file->file_mutex); }mutex_unlock (&ctx->file->file_mutex); }
drivers/net/forcedeth.c +3 -0
@@ -2815,11 +2815,13 @@ static int nv_request_irq(struct net_dev }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; }
@@ -2862,6 +2864,7 @@ static void nv_free_irq(struct net_devicfree_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 @@ #else#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 )
drivers/net/tokenring/ibmtr.c +1 -1
@@ -1826,7 +1826,7 @@ #define BUFFER_LENGTH_OFST 6 skb->protocol =tr_type_trans (skb, dev);if (IPv4_p) { skb->csum = chksum; - skb->ip_summed =1 ; + skb->ip_summed =CHECKSUM_COMPLETE ; }netif_rx (skb); dev->last_rx = jiffies;
drivers/usb/misc/phidgetservo.c +1 -0
@@ -282,6 +282,7 @@ servo_probe(struct usb_interface *interf dev->dev =NULL ; goto out; } +dev_set_drvdata (dev->dev, dev); servo_count = dev->type &SERVO_COUNT_QUAD ?4 :1 ;
fs/autofs/inode.c +4 -3
@@ -28,10 +28,11 @@ void autofs_kill_sb(struct super_block */* * In the event of a failure in get_sb_nodev the superblock * info is not present so nothing else has been setup, so -* just exit when we are called from deactivate_super. +* just call kill_anon_super when we are called from +* deactivate_super. */ if (!sbi) -return ; + goto out_kill_sb;if ( !sbi->catatonic )autofs_catatonic_mode (sbi);/* Free wait queues, close pipe */
@@ -44,6 +45,7 @@ void autofs_kill_sb(struct super_block *kfree (sb->s_fs_info); +out_kill_sb:DPRINTK (("autofs: shutting down\n" ));kill_anon_super (sb); }
@@ -209,7 +211,6 @@ fail_iput: fail_free:kfree (sbi); s->s_fs_info =NULL ; -kill_anon_super (s); fail_unlock:return -EINVAL ; }
fs/autofs4/inode.c +4 -3
@@ -152,10 +152,11 @@ void autofs4_kill_sb(struct super_block/* * In the event of a failure in get_sb_nodev the superblock * info is not present so nothing else has been setup, so -* just exit when we are called from deactivate_super. +* just call kill_anon_super when we are called from +* deactivate_super. */ if (!sbi) -return ; + goto out_kill_sb; sb->s_fs_info =NULL ;
@@ -167,6 +168,7 @@ void autofs4_kill_sb(struct super_blockkfree (sbi); +out_kill_sb:DPRINTK ("shutting down" );kill_anon_super (sb); }
@@ -426,7 +428,6 @@ fail_ino: fail_free:kfree (sbi); s->s_fs_info =NULL ; -kill_anon_super (s); fail_unlock:return -EINVAL ; }
fs/compat.c +1 -1
@@ -869,7 +869,7 @@ asmlinkage long compat_sys_mount(char __ 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 )) {
fs/exec.c +2 -1
@@ -1515,7 +1515,8 @@ int do_coredump(long signr, int exit_cod ispipe =1 ; }else file =filp_open (corename, -O_CREAT |2 |O_NOFOLLOW |O_LARGEFILE ,0600 ); +O_CREAT |2 |O_NOFOLLOW |O_LARGEFILE | flag, +0600 );if (IS_ERR (file)) goto fail_unlock; inode = file->f_dentry->d_inode;
include/asm-m32r/ptrace.h +4 -24
@@ -33,21 +33,10 @@ #define PT_R14 PT_LR#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;
include/linux/bottom_half.h new file +5 -0
@@ -0,0 +1,5 @@ +extern void local_bh_disable (void ); +extern void __local_bh_enable (void ); +extern void _local_bh_enable (void ); +extern void local_bh_enable (void ); +extern void local_bh_enable_ip (unsigned long ip);
include/linux/if_addr.h +6 -0
@@ -52,4 +52,10 @@ struct ifa_cacheinfo __u32 tstamp; /* updated timestamp, hundredths of seconds */ }; +/* backwards compatibility for userspace */ +#ifndef __KERNEL__ +#define IFA_RTA (r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)))) +#define IFA_PAYLOAD (n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg)) +#endif +#endif
include/linux/if_link.h +6 -0
@@ -82,6 +82,12 @@ #define IFLA_WEIGHT IFLA_WEIGHT#define IFLA_MAX (__IFLA_MAX - 1) +/* backwards compatibility for userspace */ +#ifndef __KERNEL__ +#define IFLA_RTA (r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)))) +#define IFLA_PAYLOAD (n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) +#endif +/* ifi_flags. IFF_* flags.
include/linux/interrupt.h +1 -6
@@ -11,6 +11,7 @@ #include <linux/irqreturn.h>#include <linux/hardirq.h> #include <linux/sched.h> #include <linux/irqflags.h> +#include <linux/bottom_half.h> #include <asm/atomic.h> #include <asm/ptrace.h> #include <asm/system.h>
@@ -217,12 +218,6 @@ static inline void __deprecated save_and#define save_and_cli (x) save_and_cli(&x)#endif /* CONFIG_SMP */ -extern void local_bh_disable (void ); -extern void __local_bh_enable (void ); -extern void _local_bh_enable (void ); -extern void local_bh_enable (void ); -extern void local_bh_enable_ip (unsigned long ip); -/* PLEASE, avoid to allocate new softirqs, if you need not _really_ high frequency threaded job scheduling. For almost all the purposes tasklets are more than enough. F.e. all serial device BHs et
include/linux/rtnetlink.h +2 -0
@@ -3,6 +3,8 @@ #define __LINUX_RTNETLINK_H#include <linux/netlink.h> #include <linux/if_link.h> +#include <linux/if_addr.h> +#include <linux/neighbour.h> /**** * Routing/neighbour discovery messages.
include/linux/spinlock.h +1 -0
@@ -52,6 +52,7 @@ #include <linux/compiler.h>#include <linux/thread_info.h> #include <linux/kernel.h> #include <linux/stringify.h> +#include <linux/bottom_half.h> #include <asm/system.h>
kernel/power/disk.c +1 -1
@@ -127,7 +127,7 @@ int pm_suspend_disk(void)return error;if (pm_disk_mode ==PM_DISK_TESTPROC ) - goto Thaw; +return 0 ;suspend_console (); error =device_suspend (PMSG_FREEZE );
kernel/softirq.c +0 -2
@@ -574,8 +574,6 @@ static int __cpuinit cpu_callback(structswitch (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/bridge/br_netfilter.c +28 -8
@@ -34,6 +34,7 @@ #include <linux/netfilter_ipv4.h>#include <linux/netfilter_ipv6.h> #include <linux/netfilter_arp.h> #include <linux/in_route.h> +#include <linux/inetdevice.h> #include <net/ip.h> #include <net/ipv6.h>
@@ -222,10 +223,14 @@ static void __br_dnat_complain(void)* * Otherwise, the packet is considered to be routed and we just * change the destination MAC address so that the packet will -* later be passed up to the IP stack to be routed. +* later be passed up to the IP stack to be routed. For a redirected +* packet, ip_route_input() will give back the localhost as output device, +* which differs from the bridge device. * * Let us now consider the case that ip_route_input() fails: * +* This can be because the destination address is martian, in which case +* the packet will be dropped. * After a "echo '0' > /proc/sys/net/ipv4/ip_forward" ip_route_input() * will fail, while __ip_route_output_key() will return success. The source * address for __ip_route_output_key() is set to zero, so __ip_route_output_key
@@ -238,7 +243,8 @@ static void __br_dnat_complain(void)* * --Lennert, 20020411 * --Bart, 20020416 (updated) -* --Bart, 20021007 (updated) */ +* --Bart, 20021007 (updated) +* --Bart, 20062711 (updated) */ static int br_nf_pre_routing_finish_bridge (struct sk_buff *skb) {if (skb->pkt_type ==PACKET_OTHERHOST ) {
@@ -265,15 +271,15 @@ static int br_nf_pre_routing_finish(strustruct net_device *dev = skb->dev;struct iphdr *iph = skb->nh.iph;struct nf_bridge_info *nf_bridge = skb->nf_bridge; +int err;if (nf_bridge->mask &BRNF_PKT_TYPE ) { skb->pkt_type =PACKET_OTHERHOST ; nf_bridge->mask ^=BRNF_PKT_TYPE ; } nf_bridge->mask ^=BRNF_NF_BRIDGE_PREROUTING ; -if (dnat_took_place (skb)) { -if (ip_route_input (skb, iph->daddr, iph->saddr, iph->tos, dev)) { +if ((err =ip_route_input (skb, iph->daddr, iph->saddr, iph->tos, dev))) {struct rtable *rt;struct flowi fl = { .nl_u = {
@@ -284,19 +290,33 @@ static int br_nf_pre_routing_finish(stru }, .proto = 0, }; +struct in_device *in_dev =in_dev_get (dev); + +/* If err equals -EHOSTUNREACH the error is due to a +* martian destination or due to the fact that +* forwarding is disabled. For most martian packets, +* ip_route_output_key() will fail. It won't fail for 2 types of +* martian destinations: loopback destinations and destination +* 0.0.0.0. In both cases the packet will be dropped because the +* destination is the loopback device and not the bridge. */ +if (err != -EHOSTUNREACH || !in_dev ||IN_DEV_FORWARD (in_dev)) + goto free_skb;if (!ip_route_output_key (&rt, &fl)) {/* - Bridged-and-DNAT'ed traffic doesn't -* require ip_forwarding. -* - Deal with redirected traffic. */ -if (((struct dst_entry *)rt)->dev == dev || - rt->rt_type ==RTN_LOCAL ) { +* require ip_forwarding. */ +if (((struct dst_entry *)rt)->dev == dev) { skb->dst = (struct dst_entry *)rt; goto bridged_dnat; } +/* we are sure that forwarding is disabled, so printing +* this message is no problem. Note that the packet could +* still have a martian destination address, in which case +* the packet could be dropped even if forwarding were enabled */ __br_dnat_complain ();dst_release ((struct dst_entry *)rt); } +free_skb:kfree_skb (skb);return 0 ; }else {
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 ieee8 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(struif (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/ieee80211/softmac/ieee80211softmac_wx.c +2 -1
@@ -495,7 +495,8 @@ ieee80211softmac_wx_set_mlme(struct net_ printk(KERN_DEBUG PFX "wx_set_mlme: we should know the net here...\n"); goto out; } -return ieee80211softmac_deauth_req (mac, net, reason); + err =ieee80211softmac_deauth_req (mac, net, reason); + goto out;case IW_MLME_DISASSOC :ieee80211softmac_send_disassoc_req (mac, reason); mac->associnfo.associated =0 ;
net/ipv4/netfilter/arp_tables.c +24 -24
89 lines not on this page · raw message
net/ipv4/netfilter/ip_tables.c +75 -69
221 lines not on this page · raw message
net/ipv4/route.c +1 -1
@@ -1784,7 +1784,7 @@ #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED#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
@@ -273,6 +273,8 @@ static void xfrm4_dst_destroy(struct dstif (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/ipv6/ndisc.c +12 -4
@@ -472,7 +472,9 @@ static void ndisc_send_na(struct net_dev inc_opt =0 ; } - skb =sock_alloc_send_skb (sk,MAX_HEADER + len +LL_RESERVED_SPACE (dev), + skb =sock_alloc_send_skb (sk, + (MAX_HEADER +sizeof (struct ipv6hdr ) + + len +LL_RESERVED_SPACE (dev)),1 , &err);if (skb ==NULL ) {
@@ -561,7 +563,9 @@ void ndisc_send_ns(struct net_device *deif (send_llinfo) len +=ndisc_opt_addr_space (dev); - skb =sock_alloc_send_skb (sk,MAX_HEADER + len +LL_RESERVED_SPACE (dev), + skb =sock_alloc_send_skb (sk, + (MAX_HEADER +sizeof (struct ipv6hdr ) + + len +LL_RESERVED_SPACE (dev)),1 , &err);if (skb ==NULL ) { ND_PRINTK0(KERN_ERR
@@ -636,7 +640,9 @@ void ndisc_send_rs(struct net_device *deif (dev->addr_len) len +=ndisc_opt_addr_space (dev); - skb =sock_alloc_send_skb (sk,MAX_HEADER + len +LL_RESERVED_SPACE (dev), + skb =sock_alloc_send_skb (sk, + (MAX_HEADER +sizeof (struct ipv6hdr ) + + len +LL_RESERVED_SPACE (dev)),1 , &err);if (skb ==NULL ) { ND_PRINTK0(KERN_ERR
@@ -1446,7 +1452,9 @@ void ndisc_send_redirect(struct sk_buff rd_len &= ~0x7 ; len += rd_len; - buff =sock_alloc_send_skb (sk,MAX_HEADER + len +LL_RESERVED_SPACE (dev), + buff =sock_alloc_send_skb (sk, + (MAX_HEADER +sizeof (struct ipv6hdr ) + + len +LL_RESERVED_SPACE (dev)),1 , &err);if (buff ==NULL ) { ND_PRINTK0(KERN_ERR
net/ipv6/netfilter/ip6_tables.c +23 -36
100 lines not on this page · raw message
net/irda/irttp.c +2 -2
@@ -1099,7 +1099,7 @@ int irttp_connect_request(struct tsap_cbreturn -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;/*
@@ -1348,7 +1348,7 @@ int irttp_connect_response(struct tsap_creturn -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
@@ -48,14 +48,14 @@ static struct tcf_hashinfo gact_hash_inf#ifdef CONFIG_GACT_PROB static int gact_net_rand (struct tcf_gact *gact) { -if (net_random () % gact->tcfg_pval) +if (!gact->tcfg_pval ||net_random () % gact->tcfg_pval)return gact->tcf_action;return gact->tcfg_paction; }static int gact_determ (struct tcf_gact *gact) { -if (gact->tcf_bstats.packets % gact->tcfg_pval) +if (!gact->tcfg_pval || gact->tcf_bstats.packets % gact->tcfg_pval)return gact->tcf_action;return gact->tcfg_paction; }
net/sched/act_police.c +22 -4
@@ -46,6 +46,18 @@ static struct tcf_hashinfo police_hash_i .lock = &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 */ #ifdef CONFIG_NET_CLS_ACT
@@ -131,12 +143,15 @@ static int tcf_act_police_locate(structstruct tc_police *parm;struct tcf_police *police;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 ]);
@@ -415,12 +430,15 @@ struct tcf_police *tcf_police_locate(strstruct tcf_police *police;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 ]);