Merge tag 'linux-can-fixes-for-4.9-20161207' of... (233900d8) · Commits · 戴 / test

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>

include/uapi/linux/can.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message