summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2016-12-05 11:44:23 +0100
committerBen Hutchings <ben@decadent.org.uk>2017-02-23 03:54:43 +0000
commit2dd5177598ac0a78ee5860f3f7cec45b41385469 (patch)
treeba7e30352c370151b4be52fb6a5570fdb76e5e67 /include
parent2cc1ff50c4772742158ea4b0f162e33db5328256 (diff)
downloadlinux-stable-2dd5177598ac0a78ee5860f3f7cec45b41385469.tar.gz
linux-stable-2dd5177598ac0a78ee5860f3f7cec45b41385469.tar.bz2
linux-stable-2dd5177598ac0a78ee5860f3f7cec45b41385469.zip
can: raw: raw_setsockopt: limit number of can_filter that can be set
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 Reported-by: Andrey Konovalov <andreyknvl@google.com> Tested-by: Andrey Konovalov <andreyknvl@google.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/can.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h
index 41892f720057..54cfc4d92883 100644
--- a/include/uapi/linux/can.h
+++ b/include/uapi/linux/can.h
@@ -190,5 +190,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 */