diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:10:55 -0800 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:10:55 -0800 |
commit | 9b133b6207826ae8cbe5f7de0b407253191e98fa (patch) | |
tree | 250eaae3c221ef7db71b3b18ccc1935ad273ec2b /net/can | |
parent | b82fdb62ee3caa1d07f47930cf54f1996fa50fd2 (diff) | |
parent | a34f0e8a2f8976f0bae4962edf2af4dd16cb85f7 (diff) |
Merge tag 'v4.4.39' into android-4.4.y
This is the 4.4.39 stable release
Change-Id: I36dd900bb57846dbbcd7b274774f1debef0f1f18
Diffstat (limited to 'net/can')
-rw-r--r-- | net/can/raw.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index 2e67b1423cd3..56af689ca999 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) { |