From: David Miller <davem@davemloft.net>
To: mathew.j.martineau@linux.intel.com
Cc: netdev@vger.kernel.org, fw@strlen.de, mptcp@lists.01.org,
edumazet@google.com, cpaasch@apple.com
Subject: Re: [PATCH net-next 1/2] mptcp: do not inherit inet proto ops
Date: Sat, 25 Jan 2020 08:14:53 +0100 (CET) [thread overview]
Message-ID: <20200125.081453.329018046256576212.davem@davemloft.net> (raw)
In-Reply-To: <20200125000403.251894-2-mathew.j.martineau@linux.intel.com>
From: Mat Martineau <mathew.j.martineau@linux.intel.com>
Date: Fri, 24 Jan 2020 16:04:02 -0800
> From: Florian Westphal <fw@strlen.de>
>
> We need to initialise the struct ourselves, else we expose tcp-specific
> callbacks such as tcp_splice_read which will then trigger splat because
> the socket is an mptcp one:
>
> BUG: KASAN: slab-out-of-bounds in tcp_mstamp_refresh+0x80/0xa0 net/ipv4/tcp_output.c:57
> Write of size 8 at addr ffff888116aa21d0 by task syz-executor.0/5478
>
> CPU: 1 PID: 5478 Comm: syz-executor.0 Not tainted 5.5.0-rc6 #3
> Call Trace:
> tcp_mstamp_refresh+0x80/0xa0 net/ipv4/tcp_output.c:57
> tcp_rcv_space_adjust+0x72/0x7f0 net/ipv4/tcp_input.c:612
> tcp_read_sock+0x622/0x990 net/ipv4/tcp.c:1674
> tcp_splice_read+0x20b/0xb40 net/ipv4/tcp.c:791
> do_splice+0x1259/0x1560 fs/splice.c:1205
>
> To prevent build error with ipv6, add the recv/sendmsg function
> declaration to ipv6.h. The functions are already accessible "thanks"
> to retpoline related work, but they are currently only made visible
> by socket.c specific INDIRECT_CALLABLE macros.
>
> Reported-by: Christoph Paasch <cpaasch@apple.com>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Applied.
next prev parent reply other threads:[~2020-01-25 7:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-25 0:04 [PATCH net-next 0/2] MPTCP: Fixups for part 2 Mat Martineau
2020-01-25 0:04 ` [PATCH net-next 1/2] mptcp: do not inherit inet proto ops Mat Martineau
2020-01-25 7:14 ` David Miller [this message]
2020-01-25 0:04 ` [PATCH net-next 2/2] mptcp: Fix code formatting Mat Martineau
2020-01-25 7:15 ` David Miller
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=20200125.081453.329018046256576212.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=cpaasch@apple.com \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
/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).