From: Neil Horman <nhorman@tuxdriver.com>
To: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: Vlad Yasevich <vyasevich@gmail.com>,
Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: Re: [PATCH 3/9] sctp: Check address length before reading srx_service field
Date: Fri, 12 Apr 2019 12:48:15 -0400 [thread overview]
Message-ID: <20190412164815.GC15012@hmswarspite.think-freely.org> (raw)
In-Reply-To: <35c0e9d1-ab92-1e64-902e-f70e1e72d828@i-love.sakura.ne.jp>
On Fri, Apr 12, 2019 at 08:21:26PM +0900, Tetsuo Handa wrote:
> On 2019/04/12 20:12, Neil Horman wrote:
> > On Fri, Apr 12, 2019 at 07:53:10PM +0900, Tetsuo Handa wrote:
> >> KMSAN will complain if valid address length passed to connect() is shorter
> >> than sizeof("struct sockaddr"->sa_family) bytes.
> >>
> >> Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
> >> ---
> >> net/sctp/socket.c | 3 ++-
> >> 1 file changed, 2 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> >> index 9874e60c9b0d..4583fa914e62 100644
> >> --- a/net/sctp/socket.c
> >> +++ b/net/sctp/socket.c
> >> @@ -4847,7 +4847,8 @@ static int sctp_connect(struct sock *sk, struct sockaddr *addr,
> >> }
> >>
> >> /* Validate addr_len before calling common connect/connectx routine. */
> >> - af = sctp_get_af_specific(addr->sa_family);
> >> + af = addr_len < offsetofend(struct sockaddr, sa_family) ? NULL :
> >> + sctp_get_af_specific(addr->sa_family);
> > I don't see anything wrong with the patch per se, but sctp_get_af_specific will
> > always return a value that is greater than offsetofend(struct sockaddr,
> > sa_family). So while this patch doesn't do anything wrong, it seems your fixing
> > an erroneous KMSAN warning in the SCTP code. Shouldn't KMSAN just be made to
> > not complain if the address length is valid?
>
> KMSAN does not complain if the address length is valid. KMSAN complains
> at addr->sa_family if the address length passed to connect() is either 0 or 1.
> Thus, we need to verify addr_len >= 2 before accessing addr->sa_family.
>
Ah, ok, then with the subject change you note in your other email
Acked-by: Neil Horman <nhorman@tuxdriver.com>
> >
> > Neil
> >
> >> if (!af || addr_len < af->sockaddr_len) {
> >> err = -EINVAL;
> >> } else {
> >> --
> >> 2.16.5
> >>
> >>
> >
>
>
next prev parent reply other threads:[~2019-04-12 16:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 10:53 [PATCH 3/9] sctp: Check address length before reading srx_service field Tetsuo Handa
2019-04-12 11:12 ` Neil Horman
2019-04-12 11:21 ` Tetsuo Handa
2019-04-12 12:38 ` Tetsuo Handa
2019-04-12 16:48 ` Neil Horman [this message]
2019-04-12 17:25 ` 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=20190412164815.GC15012@hmswarspite.think-freely.org \
--to=nhorman@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=vyasevich@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.