From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Henry Ptasinski <hptasinski@google.com>
Cc: linux-sctp@vger.kernel.org, netdev@vger.kernel.org,
Vlad Yasevich <vyasevich@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Corey Minyard <cminyard@mvista.com>
Subject: Re: [PATCH v2] net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant
Date: Sat, 19 Sep 2020 02:05:49 +0000 [thread overview]
Message-ID: <20200919020549.GA70998@localhost.localdomain> (raw)
In-Reply-To: <20200919001211.355148-1-hptasinski@google.com>
On Sat, Sep 19, 2020 at 12:12:11AM +0000, Henry Ptasinski wrote:
> When calculating ancestor_size with IPv6 enabled, simply using
> sizeof(struct ipv6_pinfo) doesn't account for extra bytes needed for
> alignment in the struct sctp6_sock. On x86, there aren't any extra
> bytes, but on ARM the ipv6_pinfo structure is aligned on an 8-byte
> boundary so there were 4 pad bytes that were omitted from the
> ancestor_size calculation. This would lead to corruption of the
> pd_lobby pointers, causing an oops when trying to free the sctp
> structure on socket close.
>
> Fixes: 636d25d557d1 ("sctp: not copy sctp_sock pd_lobby in sctp_copy_descendant")
> Signed-off-by: Henry Ptasinski <hptasinski@google.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
...
> {
> - int ancestor_size = sizeof(struct inet_sock) +
> - sizeof(struct sctp_sock) -
> - offsetof(struct sctp_sock, pd_lobby);
> -
> - if (sk_from->sk_family = PF_INET6)
> - ancestor_size += sizeof(struct ipv6_pinfo);
> + size_t ancestor_size = sizeof(struct inet_sock);
>
> + ancestor_size += sk_from->sk_prot->obj_size;
Heh, of course. Nice one.
> + ancestor_size -= offsetof(struct sctp_sock, pd_lobby);
> __inet_sk_copy_descendant(sk_to, sk_from, ancestor_size);
> }
>
> --
> 2.28.0.681.g6f77f65b4e-goog
>
next prev parent reply other threads:[~2020-09-19 2:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 1:56 [PATCH] net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant Henry Ptasinski
2020-09-18 13:29 ` Marcelo Ricardo Leitner
2020-09-19 0:12 ` [PATCH v2] " Henry Ptasinski
2020-09-19 2:05 ` Marcelo Ricardo Leitner [this message]
2020-09-20 21:16 ` 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=20200919020549.GA70998@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=cminyard@mvista.com \
--cc=davem@davemloft.net \
--cc=hptasinski@google.com \
--cc=kuba@kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--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 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).