diff options
| author | David S. Miller <davem@davemloft.net> | 2016-12-07 12:07:09 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-07 12:07:09 -0500 |
| commit | 233900d8857dc426557751e30b2150778974417c (patch) | |
| tree | f30e326f3e623c103bc6e9735e7e958a90ecef20 | |
| parent | bc3913a5378cd0ddefd1dfec6917cc12eb23a946 (diff) | |
| parent | 332b05ca7a438f857c61a3c21a88489a21532364 (diff) | |
| download | playground-233900d8857dc426557751e30b2150778974417c.tar.gz | |
Merge tag 'linux-can-fixes-for-4.9-20161207' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2016-12-07
Andrey Konovalov triggered a warning in the CAN RAW layer, which is
fixed by a patch by me.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/uapi/linux/can.h | 1 | ||||
| -rw-r--r-- | net/can/raw.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h index 9692cda5f8fc2f..c48d93a28d1acb 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 */ diff --git a/net/can/raw.c b/net/can/raw.c index 972c187d40abb0..b075f028d7e239 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -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) { |