Skip to contentSkip to conversation

hv_netvsc: Validate number of allocated sub-channels

PATCH Applied Andrea Parri (Microsoft) 5 participants 5 messages Nov 18, 2020 – Dec 13, 2020

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

PATCH 1/1 hv_netvsc: Validate number of allocated sub-channels

Lack of validation could lead to out-of-bound reads and information leaks (cf. usage of nvdev->chan_table[]). Check that the number of allocated sub-channels fits into the expected range.

---
Based on hyperv-next.

 drivers/net/hyperv/rndis_filter.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/net/hyperv/rndis_filter.c +5 -0
index 3835d9bea1005..c5a709f67870f 100644
@@ -1226,6 +1226,11 @@ int rndis_set_subchannel(struct net_device *ndev,
 		return -EIO;
 	}
 
+	/* Check that number of allocated sub channel is within the expected range */
+	if (init_packet->msg.v5_msg.subchn_comp.num_subchannels > nvdev->num_chn - 1) {
+		netdev_err(ndev, "invalid number of allocated sub channel\n");
+		return -EINVAL;
+	}
 	nvdev->num_chn = 1 +
 		init_packet->msg.v5_msg.subchn_comp.num_subchannels;
 
Signature · 1 line
2.25.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 46 lines

-----Original Message-----
From: Andrea Parri (Microsoft) <[email protected]>
Sent: Wednesday, November 18, 2020 10:33 AM
To: [email protected]
Cc: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; Stephen Hemminger <[email protected]>; Wei Liu <[email protected]>; linux- [email protected]; Michael Kelley <[email protected]>; Juan Vazquez <[email protected]>; Saruhan Karademir <[email protected]>; Andrea Parri (Microsoft) <[email protected]>; David S. Miller <[email protected]>; Jakub Kicinski <[email protected]>; [email protected]
Subject: [PATCH] hv_netvsc: Validate number of allocated sub-channels

Lack of validation could lead to out-of-bound reads and information leaks (cf. usage of nvdev->chan_table[]). Check that the number of allocated sub- channels fits into the expected range.

---
Based on hyperv-next.

 drivers/net/hyperv/rndis_filter.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/net/hyperv/rndis_filter.c +1 -0
index 3835d9bea1005..c5a709f67870f 100644
@@ -1226,6 +1226,11 @@ int rndis_set_subchannel(struct net_device *ndev,
 		return -EIO;
 	}
 
+	/* Check that number of allocated sub channel is within the expected

range */

drivers/net/hyperv/rndis_filter.c +1 -0
+	if (init_packet->msg.v5_msg.subchn_comp.num_subchannels >

nvdev->num_chn - 1) {

drivers/net/hyperv/rndis_filter.c +1 -0
+		netdev_err(ndev, "invalid number of allocated sub

channel\n");

drivers/net/hyperv/rndis_filter.c int rndis_set_subchannel(struct net_device *ndev, · line 1235

Quoted 4 lines
drivers/net/hyperv/rndis_filter.c +2 -0
+		return -EINVAL;
+	}
 	nvdev->num_chn = 1 +
 		init_packet->msg.v5_msg.subchn_comp.num_subchannels;

Thank you.

maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Andrea Parri (Microsoft)
Quoted 9 lines · On Wed, 18 Nov 2020 16:33:10 +0100 Andrea Parri (Microsoft) wrote:

Lack of validation could lead to out-of-bound reads and information leaks (cf. usage of nvdev->chan_table[]). Check that the number of allocated sub-channels fits into the expected range.

maintainer Applied
#3 lore raw
Quoted 5 lines · Jakub Kicinski
Quoted 4 lines · On Wed, 18 Nov 2020 16:33:10 +0100 Andrea Parri (Microsoft) wrote:

Lack of validation could lead to out-of-bound reads and information leaks (cf. usage of nvdev->chan_table[]). Check that the number of allocated sub-channels fits into the expected range.

Quoted 7 lines
Quoted 5 lines

Applied to hyperv-next.

Reviewed-by on v1 1/1
#4 lore raw
In reply to Andrea Parri (Microsoft)

From: Andrea Parri (Microsoft) <[email protected]> Sent: Wednesday, November 18, 2020 7:33 AM

Quoted 33 lines

Lack of validation could lead to out-of-bound reads and information leaks (cf. usage of nvdev->chan_table[]). Check that the number of allocated sub-channels fits into the expected range.

---
Based on hyperv-next.

 drivers/net/hyperv/rndis_filter.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/net/hyperv/rndis_filter.c +5 -1
index 3835d9bea1005..c5a709f67870f 100644
@@ -1226,6 +1226,11 @@ int rndis_set_subchannel(struct net_device *ndev,
 		return -EIO;
 	}
 
+	/* Check that number of allocated sub channel is within the expected range */
+	if (init_packet->msg.v5_msg.subchn_comp.num_subchannels > nvdev->num_chn - 1) {
+		netdev_err(ndev, "invalid number of allocated sub channel\n");
+		return -EINVAL;
+	}
 	nvdev->num_chn = 1 +
 		init_packet->msg.v5_msg.subchn_comp.num_subchannels;
 
--
Quoted 1 line

2.25.1