From: Davide Caratti <dcaratti@redhat.com>
To: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>,
Jiri Pirko <jiri@resnulli.us>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, wenxu <wenxu@ucloud.cn>,
Linux Kernel Network Developers <netdev@vger.kernel.org>,
Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Subject: Re: [PATCH net 2/2] net/sched: sch_frag: fix stack OOB read while fragmenting IPv4 packets
Date: Tue, 20 Apr 2021 10:59:13 +0200 [thread overview]
Message-ID: <d16e3e5ade2a01ea4404c79abcc86b7d9868f611.camel@redhat.com> (raw)
In-Reply-To: <CAM_iQpW3SPXJWeLf3Ck4QHZxetDuYcQJDFChUje3-4By8oGfnA@mail.gmail.com>
hello Cong, thanks for looking at this!
On Mon, 2021-04-19 at 11:46 -0700, Cong Wang wrote:
> On Mon, Apr 19, 2021 at 8:24 AM Davide Caratti <dcaratti@redhat.com> wrote:
> > diff --git a/net/sched/sch_frag.c b/net/sched/sch_frag.c
> > index e1e77d3fb6c0..8c06381391d6 100644
> > --- a/net/sched/sch_frag.c
> > +++ b/net/sched/sch_frag.c
> > @@ -90,16 +90,16 @@ static int sch_fragment(struct net *net, struct sk_buff *skb,
> > }
> >
> > if (skb_protocol(skb, true) == htons(ETH_P_IP)) {
> > - struct dst_entry sch_frag_dst;
> > + struct rtable sch_frag_rt = { 0 };
>
> Is setting these fields 0 sufficient here? Because normally a struct table
> is initialized by rt_dst_alloc() which sets several of them to non-zero,
> notably, rt->rt_type and rt->rt_uncached.
>
> Similar for the IPv6 part, which is initialized by rt6_info_init().
for what we do now in openvswitch and sch_frag, that should be
sufficient: a similar thing is done by br_netfilter [1], apparently for
the same "refragmentation" purposes. On a fedora host (running 5.10, but
it shouldn't be much different than current Linux), I just dumped
'fake_rtable' from a bridge device:
# ip link add name test-br0 type bridge
# ip link set dev test-br0 up
# ip link add name test-port0 type dummy
# ip link set dev test-port0 master test-br0 up
# crash
[...]
crash> net
NET_DEVICE NAME IP ADDRESS(ES)
[...]
ffff89fb44ed8000 test-br0
ffff89fbfc45c000 test-port0
crash> p sizeof(struct net_device)
$12 = 3200
crash> p ((struct net_bridge*)(0xffff89fb44ed8000 + 3200))->fake_rtable
$13 = {
dst = {
dev = 0xffff89fb44ed8000,
ops = 0xffffffffc0afef40,
_metrics = 18446744072647256257,
expires = 0,
xfrm = 0x0,
input = 0x0,
output = 0x0,
flags = 18, <-- that should be DST_NOXFRM | DST_FAKE_RTABLE
obsolete = 0,
header_len = 0,
trailer_len = 0,
__refcnt = {
counter = 1
},
__use = 0,
lastuse = 0,
lwtstate = 0x0,
callback_head = {
next = 0x0,
func = 0x0
},
error = 0,
__pad = 0,
tclassid = 0
},
rt_genid = 0,
rt_flags = 0,
rt_type = 0,
rt_is_input = 0 '\000',
rt_uses_gateway = 0 '\000',
rt_iif = 0,
rt_gw_family = 0 '\000',
{
rt_gw4 = 0,
rt_gw6 = {
in6_u = {
u6_addr8 = "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000",
u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0},
u6_addr32 = {0, 0, 0, 0}
}
}
},
rt_mtu_locked = 0,
rt_pmtu = 0,
rt_uncached = {
next = 0x0,
prev = 0x0
},
rt_uncached_list = 0x0
}
only fake_rtable.dst members are set to something, the remaining are all zero-ed.
--
davide
[1] https://elixir.bootlin.com/linux/latest/source/net/bridge/br_nf_core.c#L62
next prev parent reply other threads:[~2021-04-20 8:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 15:22 [PATCH net 0/2] fix stack OOB read while fragmenting IPv4 packets Davide Caratti
2021-04-19 15:23 ` [PATCH net 1/2] openvswitch: " Davide Caratti
2021-04-21 9:27 ` Eelco Chaudron
2021-04-21 15:05 ` Davide Caratti
2021-04-22 9:17 ` Eelco Chaudron
2021-04-19 15:23 ` [PATCH net 2/2] net/sched: sch_frag: " Davide Caratti
2021-04-19 17:38 ` Marcelo Ricardo Leitner
2021-04-19 18:46 ` Cong Wang
2021-04-20 8:59 ` Davide Caratti [this message]
2021-04-20 19:25 ` Cong Wang
2021-04-20 19:27 ` Cong Wang
2021-04-23 12:11 ` [PATCH net 0/2] " Davide Caratti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d16e3e5ade2a01ea4404c79abcc86b7d9868f611.camel@redhat.com \
--to=dcaratti@redhat.com \
--cc=davem@davemloft.net \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=wenxu@ucloud.cn \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).