Skip to contentSkip to conversation

pull request (net): ipsec 2019-09-05

PATCH New Steffen Klassert 3 participants 15 messages Sep 5, 2019 – Dec 3, 2019

Subsystems (4)
lore
Share & tools
lore
author maintainer
#2 lore raw

PATCH 2/5 xfrm interface: ifname may be wrong in logs

In reply to Steffen Klassert

From: Nicolas Dichtel <[email protected]>

The ifname is copied when the interface is created, but is never updated later. In fact, this property is used only in one error message, where the netdevice pointer is available, thus let's use it.

Fixes f203b76d7809 ("xfrm: Add virtual xfrm interfaces")
---
 include/net/xfrm.h        |  1 -
 net/xfrm/xfrm_interface.c | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)
include/net/xfrm.h +0 -1
index b22db30c3d88..ad761ef84797 100644
@@ -983,7 +983,6 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
 void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);
 
 struct xfrm_if_parms {
-	char name[IFNAMSIZ];	/* name of XFRM device */
 	int link;		/* ifindex of underlying L2 interface */
 	u32 if_id;		/* interface identifyer */
 };
net/xfrm/xfrm_interface.c +1 -9
index 2310dc9e35c2..68336ee00d72 100644
@@ -145,8 +145,6 @@ static int xfrmi_create(struct net_device *dev)
 	if (err < 0)
 		goto out;
 
-	strcpy(xi->p.name, dev->name);
-
 	dev_hold(dev);
 	xfrmi_link(xfrmn, xi);
 
@@ -294,7 +292,7 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)
 	if (tdev == dev) {
 		stats->collisions++;
 		net_warn_ratelimited("%s: Local routing loop detected!\n",
-				     xi->p.name);
+				     dev->name);
 		goto tx_err_dst_release;
 	}
 
@@ -638,12 +636,6 @@ static int xfrmi_newlink(struct net *src_net, struct net_device *dev,
 	int err;
 
 	xfrmi_netlink_parms(data, &p);
-
-	if (!tb[IFLA_IFNAME])
-		return -EINVAL;
-
-	nla_strlcpy(p.name, tb[IFLA_IFNAME], IFNAMSIZ);
-
 	xi = xfrmi_locate(net, &p);
 	if (xi)
 		return -EEXIST;
Signature · 1 line
2.17.1
author maintainer
#3 lore raw

PATCH 3/5 xfrm interface: fix list corruption for x-netns

In reply to Steffen Klassert

From: Nicolas Dichtel <[email protected]>

dev_net(dev) is the netns of the device and xi->net is the link netns, where the device has been linked.
changelink() must operate in the link netns to avoid a corruption of the xfrm lists.

Note that xi->net and dev_net(xi->physdev) are always the same.

Before the patch, the xfrmi lists may be corrupted and can later trigger a kernel panic.

Fixes f203b76d7809 ("xfrm: Add virtual xfrm interfaces")
---
 net/xfrm/xfrm_interface.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/xfrm/xfrm_interface.c +4 -4
index 68336ee00d72..53e5e47b2c55 100644
@@ -503,7 +503,7 @@ static int xfrmi_change(struct xfrm_if *xi, const struct xfrm_if_parms *p)
 
 static int xfrmi_update(struct xfrm_if *xi, struct xfrm_if_parms *p)
 {
-	struct net *net = dev_net(xi->dev);
+	struct net *net = xi->net;
 	struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id);
 	int err;
 
@@ -663,9 +663,9 @@ static int xfrmi_changelink(struct net_device *dev, struct nlattr *tb[],
 			   struct nlattr *data[],
 			   struct netlink_ext_ack *extack)
 {
-	struct net *net = dev_net(dev);
+	struct xfrm_if *xi = netdev_priv(dev);
+	struct net *net = xi->net;
 	struct xfrm_if_parms p;
-	struct xfrm_if *xi;
 
 	xfrmi_netlink_parms(data, &p);
 	xi = xfrmi_locate(net, &p);
@@ -707,7 +707,7 @@ static struct net *xfrmi_get_link_net(const struct net_device *dev)
 {
 	struct xfrm_if *xi = netdev_priv(dev);
 
-	return dev_net(xi->phydev);
+	return xi->net;
 }
 
 static const struct nla_policy xfrmi_policy[IFLA_XFRM_MAX + 1] = {
Signature · 1 line
2.17.1
author maintainer
#4 lore raw

PATCH 4/5 xfrm interface: fix management of phydev

In reply to Steffen Klassert

From: Nicolas Dichtel <[email protected]>

With the current implementation, phydev cannot be removed:

$ ip link add dummy type dummy
$ ip link add xfrm1 type xfrm dev dummy if_id 1
$ ip l d dummy
 kernel:[77938.465445] unregister_netdevice: waiting for dummy to become free. Usage count = 1

Manage it like in ip tunnels, ie just keep the ifindex. Not that the side effect, is that the phydev is now optional.

Fixes f203b76d7809 ("xfrm: Add virtual xfrm interfaces")
---
 include/net/xfrm.h        |  1 -
 net/xfrm/xfrm_interface.c | 32 +++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)
include/net/xfrm.h +0 -1
index ad761ef84797..aa08a7a5f6ac 100644
@@ -990,7 +990,6 @@ struct xfrm_if_parms {
 struct xfrm_if {
 	struct xfrm_if __rcu *next;	/* next interface in list */
 	struct net_device *dev;		/* virtual device associated with interface */
-	struct net_device *phydev;	/* physical device */
 	struct net *net;		/* netns for packet i/o */
 	struct xfrm_if_parms p;		/* interface parms */
 
net/xfrm/xfrm_interface.c +17 -15
index 53e5e47b2c55..2ab4859df55a 100644
@@ -175,7 +175,6 @@ static void xfrmi_dev_uninit(struct net_device *dev)
 	struct xfrmi_net *xfrmn = net_generic(xi->net, xfrmi_net_id);
 
 	xfrmi_unlink(xfrmn, xi);
-	dev_put(xi->phydev);
 	dev_put(dev);
 }
 
@@ -362,7 +361,7 @@ static netdev_tx_t xfrmi_xmit(struct sk_buff *skb, struct net_device *dev)
 		goto tx_err;
 	}
 
-	fl.flowi_oif = xi->phydev->ifindex;
+	fl.flowi_oif = xi->p.link;
 
 	ret = xfrmi_xmit2(skb, dev, &fl);
 	if (ret < 0)
@@ -548,7 +547,7 @@ static int xfrmi_get_iflink(const struct net_device *dev)
 {
 	struct xfrm_if *xi = netdev_priv(dev);
 
-	return xi->phydev->ifindex;
+	return xi->p.link;
 }
 
 
@@ -574,12 +573,14 @@ static void xfrmi_dev_setup(struct net_device *dev)
 	dev->needs_free_netdev	= true;
 	dev->priv_destructor	= xfrmi_dev_free;
 	netif_keep_dst(dev);
+
+	eth_broadcast_addr(dev->broadcast);
 }
 
 static int xfrmi_dev_init(struct net_device *dev)
 {
 	struct xfrm_if *xi = netdev_priv(dev);
-	struct net_device *phydev = xi->phydev;
+	struct net_device *phydev = __dev_get_by_index(xi->net, xi->p.link);
 	int err;
 
 	dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
@@ -594,13 +595,19 @@ static int xfrmi_dev_init(struct net_device *dev)
 
 	dev->features |= NETIF_F_LLTX;
 
-	dev->needed_headroom = phydev->needed_headroom;
-	dev->needed_tailroom = phydev->needed_tailroom;
+	if (phydev) {
+		dev->needed_headroom = phydev->needed_headroom;
+		dev->needed_tailroom = phydev->needed_tailroom;
 
-	if (is_zero_ether_addr(dev->dev_addr))
-		eth_hw_addr_inherit(dev, phydev);
-	if (is_zero_ether_addr(dev->broadcast))
-		memcpy(dev->broadcast, phydev->broadcast, dev->addr_len);
+		if (is_zero_ether_addr(dev->dev_addr))
+			eth_hw_addr_inherit(dev, phydev);
+		if (is_zero_ether_addr(dev->broadcast))
+			memcpy(dev->broadcast, phydev->broadcast,
+			       dev->addr_len);
+	} else {
+		eth_hw_addr_random(dev);
+		eth_broadcast_addr(dev->broadcast);
+	}
 
 	return 0;
 }
@@ -644,13 +651,8 @@ static int xfrmi_newlink(struct net *src_net, struct net_device *dev,
 	xi->p = p;
 	xi->net = net;
 	xi->dev = dev;
-	xi->phydev = dev_get_by_index(net, p.link);
-	if (!xi->phydev)
-		return -ENODEV;
 
 	err = xfrmi_create(dev);
-	if (err < 0)
-		dev_put(xi->phydev);
 	return err;
 }
 
Signature · 1 line
2.17.1
author maintainer
#5 lore raw

PATCH 5/5 xfrm: policy: avoid warning splat when merging nodes

In reply to Steffen Klassert

From: Florian Westphal <[email protected]>

syzbot reported a splat:

 xfrm_policy_inexact_list_reinsert+0x625/0x6e0 net/xfrm/xfrm_policy.c:877
 CPU: 1 PID: 6756 Comm: syz-executor.1 Not tainted 5.3.0-rc2+ #57
 Call Trace:
  xfrm_policy_inexact_node_reinsert net/xfrm/xfrm_policy.c:922 [inline]
  xfrm_policy_inexact_node_merge net/xfrm/xfrm_policy.c:958 [inline]
  xfrm_policy_inexact_insert_node+0x537/0xb50 net/xfrm/xfrm_policy.c:1023
  xfrm_policy_inexact_alloc_chain+0x62b/0xbd0 net/xfrm/xfrm_policy.c:1139
  xfrm_policy_inexact_insert+0xe8/0x1540 net/xfrm/xfrm_policy.c:1182
  xfrm_policy_insert+0xdf/0xce0 net/xfrm/xfrm_policy.c:1574
  xfrm_add_policy+0x4cf/0x9b0 net/xfrm/xfrm_user.c:1670
  xfrm_user_rcv_msg+0x46b/0x720 net/xfrm/xfrm_user.c:2676
  netlink_rcv_skb+0x1f0/0x460 net/netlink/af_netlink.c:2477
  xfrm_netlink_rcv+0x74/0x90 net/xfrm/xfrm_user.c:2684
  netlink_unicast_kernel net/netlink/af_netlink.c:1302 [inline]
  netlink_unicast+0x809/0x9a0 net/netlink/af_netlink.c:1328
  netlink_sendmsg+0xa70/0xd30 net/netlink/af_netlink.c:1917
  sock_sendmsg_nosec net/socket.c:637 [inline]
  sock_sendmsg net/socket.c:657 [inline]

There is no reproducer, however, the warning can be reproduced by adding rules with ever smaller prefixes.

The sanity check ("does the policy match the node") uses the prefix value of the node before its updated to the smaller value.

To fix this, update the prefix earlier. The bug has no impact on tree correctness, this is only to prevent a false warning.

---
 net/xfrm/xfrm_policy.c                     | 6 ++++--
 tools/testing/selftests/net/xfrm_policy.sh | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
net/xfrm/xfrm_policy.c +4 -2
index 8ca637a72697..0fa7c5ce3b2c 100644
@@ -912,6 +912,7 @@ static void xfrm_policy_inexact_node_reinsert(struct net *net,
 		} else if (delta > 0) {
 			p = &parent->rb_right;
 		} else {
+			bool same_prefixlen = node->prefixlen == n->prefixlen;
 			struct xfrm_policy *tmp;
 
 			hlist_for_each_entry(tmp, &n->hhead, bydst) {
@@ -919,9 +920,11 @@ static void xfrm_policy_inexact_node_reinsert(struct net *net,
 				hlist_del_rcu(&tmp->bydst);
 			}
 
+			node->prefixlen = prefixlen;
+
 			xfrm_policy_inexact_list_reinsert(net, node, family);
 
-			if (node->prefixlen == n->prefixlen) {
+			if (same_prefixlen) {
 				kfree_rcu(n, rcu);
 				return;
 			}
@@ -929,7 +932,6 @@ static void xfrm_policy_inexact_node_reinsert(struct net *net,
 			rb_erase(*p, new);
 			kfree_rcu(n, rcu);
 			n = node;
-			n->prefixlen = prefixlen;
 			goto restart;
 		}
 	}
tools/testing/selftests/net/xfrm_policy.sh +7 -0
index 5445943bf07f..7a1bf94c5bd3 100755
@@ -106,6 +106,13 @@ do_overlap()
     #
     # 10.0.0.0/24 and 10.0.1.0/24 nodes have been merged as 10.0.0.0/23.
     ip -net $ns xfrm policy add src 10.1.0.0/24 dst 10.0.0.0/23 dir fwd priority 200 action block
+
+    # similar to above: add policies (with partially random address), with shrinking prefixes.
+    for p in 29 28 27;do
+      for k in $(seq 1 32); do
+       ip -net $ns xfrm policy add src 10.253.1.$((RANDOM%255))/$p dst 10.254.1.$((RANDOM%255))/$p dir fwd priority $((200+k)) action block 2>/dev/null
+      done
+    done
 }
 
 do_esp_policy_get_check() {
Signature · 1 line
2.17.1

Steffen Klassert

author maintainer
#0 lore raw

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

2) Fix a potential warning when merging xfrm_plocy nodes. From Florian Westphal.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit 114a5c3240155fdb01bf821c9d326d7bb05bd464:

Merge tag 'mlx5-fixes-2019-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (2019-07-11 15:06:37 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master

for you to fetch changes up to 769a807d0b41df4201dbeb01c22eaeb3e5905532:

xfrm: policy: avoid warning splat when merging nodes (2019-08-20 08:09:42 +0200)

----------------------------------------------------------------
Florian Westphal (1):
xfrm: policy: avoid warning splat when merging nodes

Nicolas Dichtel (4):
xfrm interface: avoid corruption on changelink xfrm interface: ifname may be wrong in logs xfrm interface: fix list corruption for x-netns xfrm interface: fix management of phydev

 include/net/xfrm.h                         |  2 --
 net/xfrm/xfrm_interface.c                  | 56 +++++++++++++-----------------
 net/xfrm/xfrm_policy.c                     |  6 ++--
 tools/testing/selftests/net/xfrm_policy.sh |  7 ++++
 4 files changed, 36 insertions(+), 35 deletions(-)
author maintainer
#1 lore raw

PATCH 1/5 xfrm interface: avoid corruption on changelink

From: Nicolas Dichtel <[email protected]>

The new parameters must not be stored in the netdev_priv() before validation, it may corrupt the interface. Note also that if data is NULL, only a memset() is done.

$ ip link add xfrm1 type xfrm dev lo if_id 1
$ ip link add xfrm2 type xfrm dev lo if_id 2
$ ip link set xfrm1 type xfrm dev lo if_id 2
RTNETLINK answers: File exists
$ ip -d link list dev xfrm1
5: xfrm1@lo: <NOARP> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
    link/none 00:00:00:00:00:00 brd 00:00:00:00:00:00 promiscuity 0 minmtu 68 maxmtu 1500
    xfrm if_id 0x2 addrgenmode eui64 numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max_segs 65535

=> "if_id 0x2"

Fixes f203b76d7809 ("xfrm: Add virtual xfrm interfaces")
---
 net/xfrm/xfrm_interface.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
net/xfrm/xfrm_interface.c +5 -5
index 74868f9d81fb..2310dc9e35c2 100644
@@ -671,12 +671,12 @@ static int xfrmi_changelink(struct net_device *dev, struct nlattr *tb[],
 			   struct nlattr *data[],
 			   struct netlink_ext_ack *extack)
 {
-	struct xfrm_if *xi = netdev_priv(dev);
 	struct net *net = dev_net(dev);
+	struct xfrm_if_parms p;
+	struct xfrm_if *xi;
 
-	xfrmi_netlink_parms(data, &xi->p);
-
-	xi = xfrmi_locate(net, &xi->p);
+	xfrmi_netlink_parms(data, &p);
+	xi = xfrmi_locate(net, &p);
 	if (!xi) {
 		xi = netdev_priv(dev);
 	} else {
@@ -684,7 +684,7 @@ static int xfrmi_changelink(struct net_device *dev, struct nlattr *tb[],
 			return -EEXIST;
 	}
 
-	return xfrmi_update(xi, &xi->p);
+	return xfrmi_update(xi, &p);
 }
 
 static size_t xfrmi_get_size(const struct net_device *dev)
Signature · 1 line
2.17.1
maintainer
#6 lore raw
In reply to Steffen Klassert

From: Steffen Klassert <[email protected]>
Date: Thu, 5 Sep 2019 12:21:56 +0200

Quoted 10 lines

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

2) Fix a potential warning when merging xfrm_plocy nodes. From Florian Westphal.

Please pull or let me know if there are problems.

Pulled, thanks Steffen.

#7 lore raw
In reply to Steffen Klassert

Le 05/09/2019 à 12:21, Steffen Klassert a écrit :

Quoted 5 lines

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

Is it possible to queue those patches for the stable trees? And also 56c5ee1a5823 ("xfrm interface: fix memory leak on creation")?

Thank you,
Nicolas

Quoted 36 lines

2) Fix a potential warning when merging xfrm_plocy nodes. From Florian Westphal.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit 114a5c3240155fdb01bf821c9d326d7bb05bd464:

Merge tag 'mlx5-fixes-2019-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (2019-07-11 15:06:37 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master

for you to fetch changes up to 769a807d0b41df4201dbeb01c22eaeb3e5905532:

xfrm: policy: avoid warning splat when merging nodes (2019-08-20 08:09:42 +0200)

----------------------------------------------------------------
Florian Westphal (1):
xfrm: policy: avoid warning splat when merging nodes

Nicolas Dichtel (4):
xfrm interface: avoid corruption on changelink xfrm interface: ifname may be wrong in logs xfrm interface: fix list corruption for x-netns xfrm interface: fix management of phydev

 include/net/xfrm.h                         |  2 --
 net/xfrm/xfrm_interface.c                  | 56 +++++++++++++-----------------
 net/xfrm/xfrm_policy.c                     |  6 ++--
 tools/testing/selftests/net/xfrm_policy.sh |  7 ++++
 4 files changed, 36 insertions(+), 35 deletions(-)
#8 lore raw

xfrmi: request for stable trees (was: Re: pull request (net): ipsec 2019-09-05)

Le 14/10/2019 à 11:31, Nicolas Dichtel a écrit :

Quoted 7 lines

Le 05/09/2019 à 12:21, Steffen Klassert a écrit :

Quoted 5 lines

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

Is it possible to queue those patches for the stable trees?

Is there a chance to get them in the 4.19 stable tree?

Here are the sha1:
e9e7e85d75f3 ("xfrm interface: avoid corruption on changelink") e0aaa332e6a9 ("xfrm interface: ifname may be wrong in logs") c5d1030f2300 ("xfrm interface: fix list corruption for x-netns") 22d6552f827e ("xfrm interface: fix management of phydev")

Regards,
Nicolas

author maintainer
#9 lore raw

Re: xfrmi: request for stable trees (was: Re: pull request (net): ipsec 2019-09-05)

Quoted 9 lines · Nicolas Dichtel

Le 14/10/2019 à 11:31, Nicolas Dichtel a écrit :

Quoted 7 lines

Le 05/09/2019 à 12:21, Steffen Klassert a écrit :

Quoted 5 lines

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

Is it possible to queue those patches for the stable trees?

Quoted 7 lines

Is there a chance to get them in the 4.19 stable tree?

Here are the sha1:
e9e7e85d75f3 ("xfrm interface: avoid corruption on changelink") e0aaa332e6a9 ("xfrm interface: ifname may be wrong in logs") c5d1030f2300 ("xfrm interface: fix list corruption for x-netns") 22d6552f827e ("xfrm interface: fix management of phydev")

I'm ok with this. David does the stable submitting for networking patches usually. So I guess he will pick them into his stable queue after the patches are mainline some time.

maintainer
#10 lore raw

Re: xfrmi: request for stable trees

From: Steffen Klassert <[email protected]>
Date: Sun, 24 Nov 2019 11:07:46 +0100

Quoted 18 lines · Nicolas Dichtel
Quoted 9 lines

Le 14/10/2019 à 11:31, Nicolas Dichtel a écrit :

Quoted 7 lines

Le 05/09/2019 à 12:21, Steffen Klassert a écrit :

Quoted 5 lines

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

Is it possible to queue those patches for the stable trees?

Quoted 7 lines

Is there a chance to get them in the 4.19 stable tree?

Here are the sha1:
e9e7e85d75f3 ("xfrm interface: avoid corruption on changelink") e0aaa332e6a9 ("xfrm interface: ifname may be wrong in logs") c5d1030f2300 ("xfrm interface: fix list corruption for x-netns") 22d6552f827e ("xfrm interface: fix management of phydev")

Quoted 4 lines

I'm ok with this. David does the stable submitting for networking patches usually. So I guess he will pick them into his stable queue after the patches are mainline some time.

Steffen you can submit things directly to -stable for IPSEC if you wish, and it would help me in this case.

Thanks!

author maintainer
#11 lore raw

Re: xfrmi: request for stable trees

Quoted 21 lines · David Miller

From: Steffen Klassert <[email protected]>
Date: Sun, 24 Nov 2019 11:07:46 +0100

Quoted 18 lines · Nicolas Dichtel
Quoted 16 lines

Le 14/10/2019 à 11:31, Nicolas Dichtel a écrit :

Quoted 7 lines

Le 05/09/2019 à 12:21, Steffen Klassert a écrit :

Quoted 5 lines

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

Is it possible to queue those patches for the stable trees?

Is there a chance to get them in the 4.19 stable tree?

Here are the sha1:
e9e7e85d75f3 ("xfrm interface: avoid corruption on changelink") e0aaa332e6a9 ("xfrm interface: ifname may be wrong in logs") c5d1030f2300 ("xfrm interface: fix list corruption for x-netns") 22d6552f827e ("xfrm interface: fix management of phydev")

Quoted 7 lines
Quoted 4 lines

I'm ok with this. David does the stable submitting for networking patches usually. So I guess he will pick them into his stable queue after the patches are mainline some time.

Steffen you can submit things directly to -stable for IPSEC if you wish, and it would help me in this case.

Ok, can do that, no problem.
I'll submit these and do all the future IPSEC -stable submits directly.

#12 lore raw

Re: xfrmi: request for stable trees

Le 26/11/2019 à 09:12, Steffen Klassert a écrit :

Quoted 27 lines · David Miller
Quoted 26 lines

From: Steffen Klassert <[email protected]>
Date: Sun, 24 Nov 2019 11:07:46 +0100

Quoted 22 lines · Nicolas Dichtel
Quoted 9 lines

Le 14/10/2019 à 11:31, Nicolas Dichtel a écrit :

Quoted 7 lines

Le 05/09/2019 à 12:21, Steffen Klassert a écrit :

Quoted 5 lines

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

Is it possible to queue those patches for the stable trees?

Quoted 7 lines

Is there a chance to get them in the 4.19 stable tree?

Here are the sha1:
e9e7e85d75f3 ("xfrm interface: avoid corruption on changelink") e0aaa332e6a9 ("xfrm interface: ifname may be wrong in logs") c5d1030f2300 ("xfrm interface: fix list corruption for x-netns") 22d6552f827e ("xfrm interface: fix management of phydev")

I'm ok with this. David does the stable submitting for networking patches usually. So I guess he will pick them into his stable queue after the patches are mainline some time.

Quoted 6 lines
Quoted 2 lines

Steffen you can submit things directly to -stable for IPSEC if you wish, and it would help me in this case.

Ok, can do that, no problem.
I'll submit these and do all the future IPSEC -stable submits directly.

Thank you Steffen!

author maintainer
#13 lore raw

Re: xfrmi: request for stable trees (was: Re: pull request (net): ipsec 2019-09-05)

In reply to Nicolas Dichtel
Quoted 9 lines · Nicolas Dichtel

Le 14/10/2019 à 11:31, Nicolas Dichtel a écrit :

Quoted 7 lines

Le 05/09/2019 à 12:21, Steffen Klassert a écrit :

Quoted 5 lines

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

Is it possible to queue those patches for the stable trees?

Quoted 7 lines

Is there a chance to get them in the 4.19 stable tree?

Here are the sha1:
e9e7e85d75f3 ("xfrm interface: avoid corruption on changelink") e0aaa332e6a9 ("xfrm interface: ifname may be wrong in logs") c5d1030f2300 ("xfrm interface: fix list corruption for x-netns") 22d6552f827e ("xfrm interface: fix management of phydev")

Nicolas,

I'm currently processing the stable queue for v4.19. I guess we also need this patch from you:

56c5ee1a5823 ("xfrm interface: fix memory leak on creation")

before we apply the above mentioned patches, right?

#14 lore raw

Re: xfrmi: request for stable trees

Le 03/12/2019 à 14:03, Steffen Klassert a écrit :

Quoted 18 lines · Nicolas Dichtel
Quoted 9 lines

Le 14/10/2019 à 11:31, Nicolas Dichtel a écrit :

Quoted 7 lines

Le 05/09/2019 à 12:21, Steffen Klassert a écrit :

Quoted 5 lines

1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.

Is it possible to queue those patches for the stable trees?

Quoted 7 lines

Is there a chance to get them in the 4.19 stable tree?

Here are the sha1:
e9e7e85d75f3 ("xfrm interface: avoid corruption on changelink") e0aaa332e6a9 ("xfrm interface: ifname may be wrong in logs") c5d1030f2300 ("xfrm interface: fix list corruption for x-netns") 22d6552f827e ("xfrm interface: fix management of phydev")

Quoted 9 lines

Nicolas,

I'm currently processing the stable queue for v4.19. I guess we also need this patch from you:

56c5ee1a5823 ("xfrm interface: fix memory leak on creation")

before we apply the above mentioned patches, right?

Right, I point it in my first email but I get an email from Sasha Levin the 25th October:
[PATCH AUTOSEL 4.19 16/37] xfrm interface: fix memory leak on creation

so I was thinking that it is already queued. But I can't see it in linux-stable.