Skip to contentSkip to conversation

Patch "can: fix oops caused by wrong rtnl dellink usage" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Aug 8, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

can: fix oops caused by wrong rtnl dellink usage

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
can-fix-oops-caused-by-wrong-rtnl-dellink-usage.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 25e1ed6e64f52a692ba3191c4fde650aab3ecc07 Mon Sep 17 00:00:00 2001

From: Oliver Hartkopp <[email protected]>
Date: Tue, 21 Jun 2016 15:45:47 +0200
Subject: can: fix oops caused by wrong rtnl dellink usage

From: Oliver Hartkopp <[email protected]>

commit 25e1ed6e64f52a692ba3191c4fde650aab3ecc07 upstream.

For 'real' hardware CAN devices the netlink interface is used to set CAN specific communication parameters. Real CAN hardware can not be created nor removed with the ip tool ...

This patch adds a private dellink function for the CAN device driver interface that does just nothing.

It's a follow up to commit 993e6f2fd ("can: fix oops caused by wrong rtnl newlink usage") but for dellink.

---
 drivers/net/can/dev.c |    6 ++++++
 1 file changed, 6 insertions(+)
drivers/net/can/dev.c +6 -0
@@ -771,6 +771,11 @@ static int can_newlink(struct net *src_n
 	return -EOPNOTSUPP;
 }
 
+static void can_dellink(struct net_device *dev, struct list_head *head)
+{
+	return;
+}
+
 static struct rtnl_link_ops can_link_ops __read_mostly = {
 	.kind		= "can",
 	.maxtype	= IFLA_CAN_MAX,
@@ -778,6 +783,7 @@ static struct rtnl_link_ops can_link_ops
 	.setup		= can_setup,
 	.newlink	= can_newlink,
 	.changelink	= can_changelink,
+	.dellink	= can_dellink,
 	.get_size	= can_get_size,
 	.fill_info	= can_fill_info,
 	.get_xstats_size = can_get_xstats_size,

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/can-fix-oops-caused-by-wrong-rtnl-dellink-usage.patch queue-3.14/can-fix-handling-of-unmodifiable-configuration-options-fix.patch