summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2016-12-05 11:44:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-12-15 08:49:22 -0800
commit083021bdba1e6d480170a4ae86cddc10f88c54d5 (patch)
tree323ffab0cc23aaf5f28da7d45db43d5b38bc45e1 /include
parent9a3baed9103bc413a5e98e13e31cd8ae7c0b5563 (diff)
downloadlinux-stable-083021bdba1e6d480170a4ae86cddc10f88c54d5.tar.gz
linux-stable-083021bdba1e6d480170a4ae86cddc10f88c54d5.tar.bz2
linux-stable-083021bdba1e6d480170a4ae86cddc10f88c54d5.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 9692cda5f8fc..c48d93a28d1a 100644
--- a/include/uapi/linux/can.h
+++ b/include/uapi/linux/can.h
@@ -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 */