Patch "can: raw: raw_setsockopt: limit number of can_filter that can be set" has been added to the 4.8-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
can: raw: raw_setsockopt: limit number of can_filter that can be set
to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
can-raw-raw_setsockopt-limit-number-of-can_filter-that-can-be-set.patch
and it can be found in the queue-4.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
332b05ca7a438f857c61a3c21a88489a21532364Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <[email protected]>
Date: Mon, 5 Dec 2016 11:44:23 +0100
Subject: can: raw: raw_setsockopt: limit number of can_filter that can be set
From: Marc Kleine-Budde <[email protected]>
commit 332b05ca7a438f857c61a3c21a88489a21532364 upstream.
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
--- include/uapi/linux/can.h | 1 + net/can/raw.c | 3 +++ 2 files changed, 4 insertions(+)
include/uapi/linux/can.h +1 -0
@@ -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
@@ -499,6 +499,9 @@ static int raw_setsockopt(struct socketif (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 ) {
Patches currently in stable-queue which might be from [email protected] are
queue-4.8/can-raw-raw_setsockopt-limit-number-of-can_filter-that-can-be-set.patch queue-4.8/can-peak-fix-bad-memory-access-and-free-sequence.patch