diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2016-12-05 05:44:23 -0500 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2016-12-07 04:45:57 -0500 |
| commit | 332b05ca7a438f857c61a3c21a88489a21532364 (patch) | |
| tree | f30e326f3e623c103bc6e9735e7e958a90ecef20 /include/uapi/linux | |
| parent | bc3913a5378cd0ddefd1dfec6917cc12eb23a946 (diff) | |
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: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/can.h | 1 |
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 { | |||
| 196 | }; | 196 | }; |
| 197 | 197 | ||
| 198 | #define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */ | 198 | #define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */ |
| 199 | #define CAN_RAW_FILTER_MAX 512 /* maximum number of can_filter set via setsockopt() */ | ||
| 199 | 200 | ||
| 200 | #endif /* !_UAPI_CAN_H */ | 201 | #endif /* !_UAPI_CAN_H */ |
