Skip to contentSkip to conversation

USB: io_edgeport: fix slab-out-of-bounds Read in edge_interrupt_callback

PATCH In review Qiujun Huang 3 participants 5 messages Mar 25, 2020 – Mar 26, 2020

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

PATCH 1/1 USB: io_edgeport: fix slab-out-of-bounds Read in edge_interrupt_callback

The boundary condition should be (length - 1) as we access data[position+1].

Reported-and-tested-by [email protected]
---
 drivers/usb/serial/io_edgeport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/io_edgeport.c +1 -1
index 5737add..4cca0b8 100644
@@ -710,7 +710,7 @@ static void edge_interrupt_callback(struct urb *urb)
 		/* grab the txcredits for the ports if available */
 		position = 2;
 		portNumber = 0;
-		while ((position < length) &&
+		while ((position < length - 1) &&
 				(portNumber < edge_serial->serial->num_ports)) {
 			txCredits = data[position] | (data[position+1] << 8);
 			if (txCredits) {
Signature · 1 line
1.8.3.1
maintainer
#1 lore raw
Quoted 24 lines · Qiujun Huang

The boundary condition should be (length - 1) as we access data[position+1].

Reported-and-tested-by [email protected]
---
 drivers/usb/serial/io_edgeport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/io_edgeport.c +1 -1
index 5737add..4cca0b8 100644
@@ -710,7 +710,7 @@ static void edge_interrupt_callback(struct urb *urb)
 		/* grab the txcredits for the ports if available */
 		position = 2;
 		portNumber = 0;
-		while ((position < length) &&
+		while ((position < length - 1) &&
 				(portNumber < edge_serial->serial->num_ports)) {
 			txCredits = data[position] | (data[position+1] << 8);
 			if (txCredits) {
Signature · 1 line
1.8.3.1

Johan, any objection from me taking this in my tree now?

thanks,

greg k-h

maintainer
#2 lore raw
Quoted 19 lines · Greg Kroah-Hartman
Quoted 18 lines · Qiujun Huang

The boundary condition should be (length - 1) as we access data[position+1].

Reported-and-tested-by [email protected]
---
 drivers/usb/serial/io_edgeport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/io_edgeport.c +1 -1
index 5737add..4cca0b8 100644
@@ -710,7 +710,7 @@ static void edge_interrupt_callback(struct urb *urb)
 		/* grab the txcredits for the ports if available */
 		position = 2;
 		portNumber = 0;
-		while ((position < length) &&
+		while ((position < length - 1) &&
Quoted 8 lines
Quoted 6 lines
drivers/usb/serial/io_edgeport.c +0 -0
 				(portNumber < edge_serial->serial->num_ports)) {
 			txCredits = data[position] | (data[position+1] << 8);
 			if (txCredits) {
Signature · 1 line
1.8.3.1

Johan, any objection from me taking this in my tree now?

Just let me take a look at it first.

Are sending another PR to Linus for 5.6? Otherwise I can include this in my 5.7 PR to you. Will try to get it to you today.

Johan

maintainer Acked-by
#3 lore raw
Quoted 29 lines · Johan Hovold
Quoted 19 lines · Greg Kroah-Hartman
Quoted 18 lines · Qiujun Huang

The boundary condition should be (length - 1) as we access data[position+1].

Reported-and-tested-by [email protected]
---
 drivers/usb/serial/io_edgeport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/io_edgeport.c +1 -1
index 5737add..4cca0b8 100644
@@ -710,7 +710,7 @@ static void edge_interrupt_callback(struct urb *urb)
 		/* grab the txcredits for the ports if available */
 		position = 2;
 		portNumber = 0;
-		while ((position < length) &&
+		while ((position < length - 1) &&
Quoted 8 lines
Quoted 6 lines
drivers/usb/serial/io_edgeport.c +0 -0
 				(portNumber < edge_serial->serial->num_ports)) {
 			txCredits = data[position] | (data[position+1] << 8);
 			if (txCredits) {
Signature · 1 line
1.8.3.1

Johan, any objection from me taking this in my tree now?

Quoted 4 lines

Just let me take a look at it first.

Are sending another PR to Linus for 5.6? Otherwise I can include this in my 5.7 PR to you. Will try to get it to you today.

This issue predates git so I'd add

Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc stable <[email protected]>

if you want to take it yourself. Just let me know, otherwise I'll include in my PR.

Johan

maintainer
#4 lore raw
Quoted 35 lines · Johan Hovold
Quoted 29 lines · Johan Hovold
Quoted 19 lines · Greg Kroah-Hartman
Quoted 18 lines · Qiujun Huang

The boundary condition should be (length - 1) as we access data[position+1].

Reported-and-tested-by [email protected]
---
 drivers/usb/serial/io_edgeport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/io_edgeport.c +1 -1
index 5737add..4cca0b8 100644
@@ -710,7 +710,7 @@ static void edge_interrupt_callback(struct urb *urb)
 		/* grab the txcredits for the ports if available */
 		position = 2;
 		portNumber = 0;
-		while ((position < length) &&
+		while ((position < length - 1) &&
Quoted 8 lines
Quoted 6 lines
drivers/usb/serial/io_edgeport.c +0 -0
 				(portNumber < edge_serial->serial->num_ports)) {
 			txCredits = data[position] | (data[position+1] << 8);
 			if (txCredits) {
Signature · 1 line
1.8.3.1

Johan, any objection from me taking this in my tree now?

Quoted 4 lines

Just let me take a look at it first.

Are sending another PR to Linus for 5.6? Otherwise I can include this in my 5.7 PR to you. Will try to get it to you today.

Quoted 8 lines

This issue predates git so I'd add

Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc stable <[email protected]>

if you want to take it yourself. Just let me know, otherwise I'll include in my PR.

I'm not sending anything to Linus for 5.6, so putting it in your 5.7 PR is fine.

thanks,

greg k-h