Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 332b05ca authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: raw: raw_setsockopt: limit number of can_filter that can be set 

This patch adds a check to limit the number of can_filters that can be
set via setsockopt on CAN_RAW sockets. Otherwise allocations > MAX_ORDER
are not prevented resulting in a warning.

Reference: https://lkml.org/lkml/2016/12/2/230



Reported-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Tested-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent bc3913a5

include/uapi/linux/can.h

+1 −0
Original line number Diff line number Diff line
@@ -196,5 +196,6 @@ struct can_filter { 
};



#define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */

#define CAN_RAW_FILTER_MAX 512 /* maximum number of can_filter set via setsockopt() */



#endif /* !_UAPI_CAN_H */

net/can/raw.c

+3 −0
Original line number Diff line number Diff line
@@ -499,6 +499,9 @@ static int raw_setsockopt(struct socket *sock, int level, int optname, 
		if (optlen % sizeof(struct can_filter) != 0)

			return -EINVAL;



		if (optlen > CAN_RAW_FILTER_MAX * sizeof(struct can_filter))

			return -EINVAL;



		count = optlen / sizeof(struct can_filter);



		if (count > 1) {