Commit aaf473d0 authored Jun 20, 2021 by Norbert Slusarek Committed by Marc Kleine-Budde Jun 24, 2021

can: j1939: j1939_sk_setsockopt(): prevent allocation of j1939 filter for optlen == 0

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: 9d71dd0c ("can: add support of SAE J1939 protocol")
Link: https://lore.kernel.org/r/20210620123842.117975-1-nslusarek@gmx.net


Signed-off-by: Norbert Slusarek <nslusarek@gmx.net>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

parent c2f5c57d

net/can/j1939/socket.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -676,7 +676,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;