projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
44ae49a
)
can: kvaser_usb: check number of channels returned by HW
author
Olivier Sobrie
<olivier@sobrie.be>
Tue, 11 Feb 2014 10:01:23 +0000
(11:01 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 7 Mar 2014 05:30:10 +0000
(21:30 -0800)
commit
862474f8b46f6c1e600d4934e40ba40646c696ec
upstream.
It is needed to check the number of channels returned by the HW because it
cannot be greater than MAX_NET_DEVICES otherwise it will crash.
Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/can/usb/kvaser_usb.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/usb/kvaser_usb.c
b/drivers/net/can/usb/kvaser_usb.c
index
4b2d5ed
..
cc3df8a
100644
(file)
--- a/
drivers/net/can/usb/kvaser_usb.c
+++ b/
drivers/net/can/usb/kvaser_usb.c
@@
-474,6
+474,8
@@
static int kvaser_usb_get_card_info(struct kvaser_usb *dev)
return err;
dev->nchannels = msg.u.cardinfo.nchannels;
+ if (dev->nchannels > MAX_NET_DEVICES)
+ return -EINVAL;
return 0;
}