| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <4DA3CB4B.9090506@scotdoyle.com>
Date: Mon, 11 Apr 2011 22:47:23 -0500
From: Scot Doyle <lkml@...tdoyle.com>
To: Stephen Hemminger <shemminger@...tta.com>
CC: Hiroaki SHIMODA <shimoda.hiroaki@...il.com>, netdev@...r.kernel.org
Subject: Re: Kernel panic when using bridge
On 04/11/2011 08:31 PM, Stephen Hemminger wrote:
>
> It would help if you gave a little more context (like diff -up)
> next time.
>
> I think the correct fix is for the skb handed to ip_compile_options
> to match the layout expected by ip_compile_options.
>
> This patch is compile tested only, please validate.
>
>
> Subject: [PATCH] bridge: set pseudo-route table before calling ip_comple_options
>
> For some ip options, ip_compile_options assumes it can find the associated
> route table. The bridge to iptables code doesn't supply the necessary
> reference causing NULL dereference.
>
> Signed-off-by: Stephen Hemminger<shemminger@...tta.com>
>
> ---
> Patch against net-next-2.6, but if validated should go to net-2.6
> and stable.
>
> --- a/net/bridge/br_netfilter.c 2011-04-11 18:18:22.534837859 -0700
> +++ b/net/bridge/br_netfilter.c 2011-04-11 18:25:15.427244826 -0700
> @@ -221,6 +221,7 @@ static int br_parse_ip_options(struct sk
> struct ip_options *opt;
> struct iphdr *iph;
> struct net_device *dev = skb->dev;
> + struct rtable *rt;
> u32 len;
>
> iph = ip_hdr(skb);
> @@ -255,6 +256,14 @@ static int br_parse_ip_options(struct sk
> return 0;
> }
>
> + /* Associate bogus bridge route table */
> + rt = bridge_parent_rtable(dev);
> + if (!rt) {
> + kfree_skb(skb);
> + return 0;
> + }
> + skb_dst_set(skb,&rt->dst);
> +
> opt->optlen = iph->ihl*4 - sizeof(struct iphdr);
> if (ip_options_compile(dev_net(dev), opt, skb))
> goto inhdr_error;
>
>
Thanks for the advice on diff context, I appreciate it. Here's the
output from the patch:
[ 422.577325] ------------[ cut here ]------------
[ 422.581932] WARNING: at net/core/dst.c:278 dst_release+0x2e/0x5d()
[ 422.588086] Hardware name: PowerEdge R510
[ 422.592075] Modules linked in: kvm_intel kvm bridge stp loop snd_pcm
snd_timer snd soundcore snd_page_alloc i7core_edac psmouse pcspkr
edac_core evdev serio_raw power_meter processor ghes tpm_tis dcdbas tpm
tpm_bios thermal_sys button hed ext2 mbcache dm_mod raid1 md_mod sd_mod
crc_t10dif usb_storage uas uhci_hcd mpt2sas scsi_transport_sas igb
ehci_hcd raid_class scsi_mod usbcore bnx2 dca [last unloaded:
scsi_wait_scan]
[ 422.629510] Pid: 0, comm: swapper Not tainted 2.6.39-rc2+ #10
[ 422.635225] Call Trace:
[ 422.637655] <IRQ> [<ffffffff81045635>] ? warn_slowpath_common+0x78/0x8c
[ 422.644425] [<ffffffffa01cbe89>] ? NF_HOOK.clone.4+0x56/0x56 [bridge]
[ 422.650918] [<ffffffff8127cd60>] ? dst_release+0x2e/0x5d
[ 422.656290] [<ffffffff8126c25f>] ? skb_release_head_state+0x21/0xeb
[ 422.662613] [<ffffffffa01cbe89>] ? NF_HOOK.clone.4+0x56/0x56 [bridge]
[ 422.669108] [<ffffffff8126c06f>] ? __kfree_skb+0x9/0x77
[ 422.674392] [<ffffffff812985f7>] ? nf_hook_slow+0x93/0x114
[ 422.679936] [<ffffffffa01cbe89>] ? NF_HOOK.clone.4+0x56/0x56 [bridge]
[ 422.686431] [<ffffffffa01cbe89>] ? NF_HOOK.clone.4+0x56/0x56 [bridge]
[ 422.692927] [<ffffffffa01cbe6f>] ? NF_HOOK.clone.4+0x3c/0x56 [bridge]
[ 422.699421] [<ffffffff812a7d8e>] ? tcp_gro_receive+0xa1/0x204
[ 422.705225] [<ffffffffa01cc1e5>] ? br_handle_frame+0x195/0x1ac [bridge]
[ 422.711892] [<ffffffffa01cc050>] ?
br_handle_frame_finish+0x1c7/0x1c7 [bridge]
[ 422.719166] [<ffffffff812764ef>] ? __netif_receive_skb+0x2a7/0x450
[ 422.725401] [<ffffffff81276928>] ? netif_receive_skb+0x52/0x58
[ 422.731289] [<ffffffff81276e2a>] ? napi_gro_receive+0x1f/0x2f
[ 422.737091] [<ffffffff812769ff>] ? napi_skb_finish+0x1c/0x31
[ 422.742809] [<ffffffffa0226fcd>] ? igb_poll+0x6d9/0x9ee [igb]
[ 422.748615] [<ffffffffa003bde2>] ? scsi_run_queue+0x2ce/0x30a [scsi_mod]
[ 422.755371] [<ffffffffa003cb31>] ? scsi_io_completion+0x44c/0x4cf
[scsi_mod]
[ 422.762472] [<ffffffff81276f55>] ? net_rx_action+0xa4/0x1b1
[ 422.768103] [<ffffffff8104ad26>] ? __do_softirq+0xb8/0x176
[ 422.773647] [<ffffffff81333c5c>] ? call_softirq+0x1c/0x30
[ 422.779104] [<ffffffff8100aa57>] ? do_softirq+0x3f/0x84
[ 422.784388] [<ffffffff8104af91>] ? irq_exit+0x3f/0x8f
[ 422.789499] [<ffffffff8100a793>] ? do_IRQ+0x85/0x9e
[ 422.794439] [<ffffffff8132cbd3>] ? common_interrupt+0x13/0x13
[ 422.800240] <EOI> [<ffffffff81061348>] ? enqueue_hrtimer+0x3f/0x53
[ 422.806575] [<ffffffffa0310417>] ? arch_local_irq_enable+0x7/0x8
[processor]
[ 422.813676] [<ffffffffa0310dab>] ? acpi_idle_enter_c1+0x86/0xa2
[processor]
[ 422.820690] [<ffffffff8125d05d>] ? cpuidle_idle_call+0xf4/0x17e
[ 422.826664] [<ffffffff81008298>] ? cpu_idle+0xa2/0xc4
[ 422.831776] [<ffffffff8169db60>] ? start_kernel+0x3b9/0x3c4
[ 422.837406] [<ffffffff8169d3c6>] ? x86_64_start_kernel+0x102/0x10f
[ 422.843640] ---[ end trace 5d4687f8472ee50c ]---
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists