Commit 615a1003 authored Nov 02, 2015 by David S. Miller

Merge tag 'linux-can-fixes-for-4.3-20151030' of...

Merge tag 'linux-can-fixes-for-4.3-20151030' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



Marc Kleine-Budde says:

====================
pull-request: can 2015-10-30

this is a pull request for the upcoming v4.3 release.

Marek Vasut provides a patch to use the correct attrlen in the nla_put() in the
can_fill_info() function.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents e6dbe1eb 562b103a

drivers/net/can/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -915,7 +915,7 @@ static int can_fill_info(struct sk_buff skb, const struct net_device dev)
		nla_put(skb, IFLA_CAN_BITTIMING_CONST,
		sizeof(*priv->bittiming_const), priv->bittiming_const)) \|\|

		nla_put(skb, IFLA_CAN_CLOCK, sizeof(cm), &priv->clock) \|\|
		nla_put(skb, IFLA_CAN_CLOCK, sizeof(priv->clock), &priv->clock) \|\|
		nla_put_u32(skb, IFLA_CAN_STATE, state) \|\|
		nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm) \|\|
		nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms) \|\|

Original line number	Diff line number	Diff line
		@@ -915,7 +915,7 @@ static int can_fill_info(struct sk_buff skb, const struct net_device dev)
		nla_put(skb, IFLA_CAN_BITTIMING_CONST,
		sizeof(*priv->bittiming_const), priv->bittiming_const)) \|\|

		nla_put(skb, IFLA_CAN_CLOCK, sizeof(cm), &priv->clock) \|\|
		nla_put(skb, IFLA_CAN_CLOCK, sizeof(priv->clock), &priv->clock) \|\|
		nla_put_u32(skb, IFLA_CAN_STATE, state) \|\|
		nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm) \|\|
		nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms) \|\|

Admin message