From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Norbert Slusarek <nslusarek@gmx.net>
Cc: netdev@vger.kernel.org, socketcan@hartkopp.net,
linux-can@vger.kernel.org, mkl@pengutronix.de,
kernel@pengutronix.de, kuba@kernel.org, davem@davemloft.net
Subject: Re: [PATCH] can: j1939: prevent allocation of j1939 filter for optlen = 0
Date: Mon, 21 Jun 2021 06:47:57 +0200 [thread overview]
Message-ID: <20210621044757.vchomm57vno6qq5n@pengutronix.de> (raw)
In-Reply-To: <20210620123842.117975-1-nslusarek@gmx.net>
Hi Norbert,
On Sun, Jun 20, 2021 at 02:38:42PM +0200, Norbert Slusarek wrote:
> If optval != NULL and optlen = 0 are specified for SO_J1939_FILTER in
> j1939_sk_setsockopt(), memdup_sockptr() will return ZERO_PTR for 0 size
> allocation. The new filter will be mistakenly assigned ZERO_PTR.
> This patch checks for optlen != 0 and filter will be assigned NULL
> in case of optlen = 0.
>
> Fixes: a7b75c5a8c41 ("net: pass a sockptr_t into ->setsockopt")
> Signed-off-by: Norbert Slusarek <nslusarek@gmx.net>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
Thank you!
> ---
> net/can/j1939/socket.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c
> index 56aa66147d5a..ff20cb629200 100644
> --- a/net/can/j1939/socket.c
> +++ b/net/can/j1939/socket.c
> @@ -673,7 +673,7 @@ static int j1939_sk_setsockopt(struct socket *sock, int level, int optname,
>
> switch (optname) {
> case SO_J1939_FILTER:
> - if (!sockptr_is_null(optval)) {
> + if (!sockptr_is_null(optval) && optlen != 0) {
> struct j1939_filter *f;
> int c;
>
> --
> 2.30.2
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2021-06-21 4:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-20 12:38 [PATCH] can: j1939: prevent allocation of j1939 filter for optlen = 0 Norbert Slusarek
2021-06-21 4:47 ` Oleksij Rempel [this message]
2021-06-21 7:47 ` Marc Kleine-Budde
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=20210621044757.vchomm57vno6qq5n@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=nslusarek@gmx.net \
--cc=socketcan@hartkopp.net \
/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).