commit ad72c347e56bf3a0231b9d686e17764157d2961c
author Christian Pellegrin <chripell@fsfe.org> Thu Jan 14 07:08:34 2010 +0000
committer David S. Miller <davem@davemloft.net> Fri Jan 15 01:39:17 2010 -0800
tree 4db03a0abae50edfaf996f43e3f717a57b776fbd
parent 1954dc11776ef8c06263ba4cd21bf4d25c79a19c

can: Proper ctrlmode handling for CAN devices

This patch adds error checking of ctrlmode values for CAN devices. As
an example all availabe bits are implemented in the mcp251x driver.

Signed-off-by: Christian Pellegrin <chripell@fsfe.org>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/can/dev.c

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index c1bb29f..f08f120 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -592,6 +592,8 @@
 		if (dev->flags & IFF_UP)
 			return -EBUSY;
 		cm = nla_data(data[IFLA_CAN_CTRLMODE]);
+		if (cm->flags & ~priv->ctrlmode_supported)
+			return -EOPNOTSUPP;
 		priv->ctrlmode &= ~cm->mask;
 		priv->ctrlmode |= cm->flags;
 	}