Skip to contentSkip to conversation

net/smc: fixes 2022-04-08

PATCH Applied Karsten Graul 3 participants 6 messages Apr 8, 2022 – Apr 12, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover net/smc: fixes 2022-04-08

Please apply the following patches to netdev's net tree.

Patch 1 fixes two usages of snprintf() with non null-terminated string which results into an out-of-bounds read.
Pach 2 fixes a syzbot finding where a pointer check was missed before the call to dev_name().
Patch 3 fixes a crash when already released memory is used as a function pointer.

Karsten Graul (3):
net/smc: use memcpy instead of snprintf to avoid out of bounds read net/smc: Fix NULL pointer dereference in smc_pnet_find_ib() net/smc: Fix af_ops of child socket pointing to released memory

 net/smc/af_smc.c   | 14 ++++++++++++--
 net/smc/smc_clc.c  |  6 ++++--
 net/smc/smc_pnet.c |  5 +++--
 3 files changed, 19 insertions(+), 6 deletions(-)
Signature · 1 line
2.32.0
#1 lore raw

PATCH 1/3 net/smc: use memcpy instead of snprintf to avoid out of bounds read

Using snprintf() to convert not null-terminated strings to null terminated strings may cause out of bounds read in the source string. Therefore use memcpy() and terminate the target string with a null afterwards.

Fixes fa0866625543 ("net/smc: add support for user defined EIDs")
Fixes 3c572145c24e ("net/smc: add generic netlink support for system EID")
---
 net/smc/smc_clc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
net/smc/smc_clc.c +4 -2
index ce27399b38b1..f9f3f59c79de 100644
@@ -191,7 +191,8 @@ static int smc_nl_ueid_dumpinfo(struct sk_buff *skb, u32 portid, u32 seq,
 			  flags, SMC_NETLINK_DUMP_UEID);
 	if (!hdr)
 		return -ENOMEM;
-	snprintf(ueid_str, sizeof(ueid_str), "%s", ueid);
+	memcpy(ueid_str, ueid, SMC_MAX_EID_LEN);
+	ueid_str[SMC_MAX_EID_LEN] = 0;
 	if (nla_put_string(skb, SMC_NLA_EID_TABLE_ENTRY, ueid_str)) {
 		genlmsg_cancel(skb, hdr);
 		return -EMSGSIZE;
@@ -252,7 +253,8 @@ int smc_nl_dump_seid(struct sk_buff *skb, struct netlink_callback *cb)
 		goto end;
 
 	smc_ism_get_system_eid(&seid);
-	snprintf(seid_str, sizeof(seid_str), "%s", seid);
+	memcpy(seid_str, seid, SMC_MAX_EID_LEN);
+	seid_str[SMC_MAX_EID_LEN] = 0;
 	if (nla_put_string(skb, SMC_NLA_SEID_ENTRY, seid_str))
 		goto err;
 	read_lock(&smc_clc_eid_table.lock);
Signature · 1 line
2.32.0
#2 lore raw

PATCH 2/3 net/smc: Fix NULL pointer dereference in smc_pnet_find_ib()

In reply to Karsten Graul

dev_name() was called with dev.parent as argument but without to NULL-check it before.
Solve this by checking the pointer before the call to dev_name().

Fixes af5f60c7e3d5 ("net/smc: allow PCI IDs as ib device names in the pnet table")
Reported-by [email protected]
---
 net/smc/smc_pnet.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
net/smc/smc_pnet.c +3 -2
index 7984f8883472..7055ed10e316 100644
@@ -311,8 +311,9 @@ static struct smc_ib_device *smc_pnet_find_ib(char *ib_name)
 	list_for_each_entry(ibdev, &smc_ib_devices.list, list) {
 		if (!strncmp(ibdev->ibdev->name, ib_name,
 			     sizeof(ibdev->ibdev->name)) ||
-		    !strncmp(dev_name(ibdev->ibdev->dev.parent), ib_name,
-			     IB_DEVICE_NAME_MAX - 1)) {
+		    (ibdev->ibdev->dev.parent &&
+		     !strncmp(dev_name(ibdev->ibdev->dev.parent), ib_name,
+			     IB_DEVICE_NAME_MAX - 1))) {
 			goto out;
 		}
 	}
Signature · 1 line
2.32.0
#3 lore raw

PATCH 3/3 net/smc: Fix af_ops of child socket pointing to released memory

In reply to Karsten Graul

Child sockets may inherit the af_ops from the parent listen socket. When the listen socket is released then the af_ops of the child socket points to released memory.
Solve that by restoring the original af_ops for child sockets which inherited the parent af_ops. And clear any inherited user_data of the parent socket.

Fixes 8270d9c21041 ("net/smc: Limit backlog connections")
---
 net/smc/af_smc.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
net/smc/af_smc.c +12 -2
index f0d118e9f155..14ddc40149e8 100644
@@ -121,6 +121,7 @@ static struct sock *smc_tcp_syn_recv_sock(const struct sock *sk,
 					  bool *own_req)
 {
 	struct smc_sock *smc;
+	struct sock *child;
 
 	smc = smc_clcsock_user_data(sk);
 
@@ -134,8 +135,17 @@ static struct sock *smc_tcp_syn_recv_sock(const struct sock *sk,
 	}
 
 	/* passthrough to original syn recv sock fct */
-	return smc->ori_af_ops->syn_recv_sock(sk, skb, req, dst, req_unhash,
-					      own_req);
+	child = smc->ori_af_ops->syn_recv_sock(sk, skb, req, dst, req_unhash,
+					       own_req);
+	/* child must not inherit smc or its ops */
+	if (child) {
+		rcu_assign_sk_user_data(child, NULL);
+
+		/* v4-mapped sockets don't inherit parent ops. Don't restore. */
+		if (inet_csk(child)->icsk_af_ops == inet_csk(sk)->icsk_af_ops)
+			inet_csk(child)->icsk_af_ops = smc->ori_af_ops;
+	}
+	return child;
 
 drop:
 	dst_release(dst);
Signature · 1 line
2.32.0
maintainer Reviewed-by on v1 3/3
#4 lore raw

Re: [PATCH net 3/3] net/smc: Fix af_ops of child socket pointing to released memory

Quoted 48 lines · Karsten Graul

Child sockets may inherit the af_ops from the parent listen socket. When the listen socket is released then the af_ops of the child socket points to released memory.
Solve that by restoring the original af_ops for child sockets which inherited the parent af_ops. And clear any inherited user_data of the parent socket.

Fixes 8270d9c21041 ("net/smc: Limit backlog connections")
---
 net/smc/af_smc.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
net/smc/af_smc.c +12 -2
index f0d118e9f155..14ddc40149e8 100644
@@ -121,6 +121,7 @@ static struct sock *smc_tcp_syn_recv_sock(const struct sock *sk,
 					  bool *own_req)
 {
 	struct smc_sock *smc;
+	struct sock *child;
 
 	smc = smc_clcsock_user_data(sk);
 
@@ -134,8 +135,17 @@ static struct sock *smc_tcp_syn_recv_sock(const struct sock *sk,
 	}
 
 	/* passthrough to original syn recv sock fct */
-	return smc->ori_af_ops->syn_recv_sock(sk, skb, req, dst, req_unhash,
-					      own_req);
+	child = smc->ori_af_ops->syn_recv_sock(sk, skb, req, dst, req_unhash,
+					       own_req);
+	/* child must not inherit smc or its ops */
+	if (child) {
+		rcu_assign_sk_user_data(child, NULL);
+
+		/* v4-mapped sockets don't inherit parent ops. Don't restore. */
+		if (inet_csk(child)->icsk_af_ops == inet_csk(sk)->icsk_af_ops)
+			inet_csk(child)->icsk_af_ops = smc->ori_af_ops;
+	}
+	return child;
 
 drop:
 	dst_release(dst);
Signature · 1 line
2.32.0

My bad, LGTM, Thanks for your fix.

#5 lore raw
In reply to Karsten Graul
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Fri, 8 Apr 2022 17:10:32 +0200 you wrote:

Please apply the following patches to netdev's net tree.

Patch 1 fixes two usages of snprintf() with non null-terminated string which results into an out-of-bounds read.
Pach 2 fixes a syzbot finding where a pointer check was missed before the call to dev_name().
Patch 3 fixes a crash when already released memory is used as a function pointer.

[...]

Here is the summary with links:
- [net,1/3] net/smc: use memcpy instead of snprintf to avoid out of bounds read

    https://git.kernel.org/netdev/net/c/b1871fd48efc
  - [net,2/3] net/smc: Fix NULL pointer dereference in smc_pnet_find_ib()
    https://git.kernel.org/netdev/net/c/d22f4f977236
  - [net,3/3] net/smc: Fix af_ops of child socket pointing to released memory
    https://git.kernel.org/netdev/net/c/49b7d376abe5

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html