Skip to contentSkip to conversation

net: nfc: nci: fix for UBSAN: shift-out-of-bounds in nci_activate_target

PATCH In review Anup Sharma 2 participants 5 messages Apr 19, 2023 1 message not in the archive

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

PATCH 1/1 net: nfc: nci: fix for UBSAN: shift-out-of-bounds in nci_activate_target

syzbot found UBSAN: shift-out-of-bounds in nci_activate_target [1], when nci_target->supported_protocols is bigger than UNIT_MAX, where supported_protocols is unsigned 32-bit interger type.

32 is the maximum allowed for supported_protocols. Added a check for it.

[1] UBSAN: shift-out-of-bounds in net/nfc/nci/core.c:912:45 shift exponent 4294967071 is too large for 32-bit type 'int'

Call Trace:
 <TASK>
 __dump_stack lib/dump_stack.c:88 [inline]
 dump_stack_lvl+0x136/0x150 lib/dump_stack.c:106
 ubsan_epilogue lib/ubsan.c:217 [inline]
 __ubsan_handle_shift_out_of_bounds+0x221/0x5a0 lib/ubsan.c:387
 nci_activate_target.cold+0x1a/0x1f net/nfc/nci/core.c:912
 nfc_activate_target+0x1f8/0x4c0 net/nfc/core.c:420
 nfc_genl_activate_target+0x1f3/0x290 net/nfc/netlink.c:900
 genl_family_rcv_msg_doit.isra.0+0x1e6/0x2d0 net/netlink/genetlink.c:968
 genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline]
---
 net/nfc/nci/core.c | 5 +++++
 1 file changed, 5 insertions(+)
net/nfc/nci/core.c +5 -0
index fff755dde30d..e9d968bd1cd9 100644
@@ -908,6 +908,11 @@ static int nci_activate_target(struct nfc_dev *nfc_dev,
 		pr_err("unable to find the selected target\n");
 		return -EINVAL;
 	}
+	
+	if (nci_target->supported_protocols >= 32) {
+		pr_err("Too many supported protocol by the device\n");
+		return -EINVAL;
+	}
 
 	if (!(nci_target->supported_protocols & (1 << protocol))) {
 		pr_err("target does not support the requested protocol 0x%x\n",
Signature · 1 line
2.34.1
#1 lore raw
Quoted 2 lines · Anup Sharma

syzbot found UBSAN: shift-out-of-bounds in nci_activate_target [1], when nci_target->supported_protocols is bigger than UNIT_MAX,

UINT_MAX?

Quoted 1 line

where supported_protocols is unsigned 32-bit interger type.

integer?

Quoted 31 lines

32 is the maximum allowed for supported_protocols. Added a check for it.

[1] UBSAN: shift-out-of-bounds in net/nfc/nci/core.c:912:45 shift exponent 4294967071 is too large for 32-bit type 'int'

Call Trace:
 <TASK>
 __dump_stack lib/dump_stack.c:88 [inline]
 dump_stack_lvl+0x136/0x150 lib/dump_stack.c:106
 ubsan_epilogue lib/ubsan.c:217 [inline]
 __ubsan_handle_shift_out_of_bounds+0x221/0x5a0 lib/ubsan.c:387
 nci_activate_target.cold+0x1a/0x1f net/nfc/nci/core.c:912
 nfc_activate_target+0x1f8/0x4c0 net/nfc/core.c:420
 nfc_genl_activate_target+0x1f3/0x290 net/nfc/netlink.c:900
 genl_family_rcv_msg_doit.isra.0+0x1e6/0x2d0 net/netlink/genetlink.c:968
 genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline]
---
 net/nfc/nci/core.c | 5 +++++
 1 file changed, 5 insertions(+)
net/nfc/nci/core.c +0 -0
index fff755dde30d..e9d968bd1cd9 100644

net/nfc/nci/core.c static int nci_activate_target(struct nfc_dev *nfc_dev, · line 912

Quoted 5 lines
net/nfc/nci/core.c +2 -0
@@ -908,6 +908,11 @@ static int nci_activate_target(struct nfc_dev *nfc_dev,
 		pr_err("unable to find the selected target\n");
 		return -EINVAL;
 	}
+	
+	if (nci_target->supported_protocols >= 32) {

I don't think it makes any sense. How do you protect from UBSAN reported shift? Why supported_protocols cannot be 33? You are not shifting the supported_protocols...

net/nfc/nci/core.c static int nci_activate_target(struct nfc_dev *nfc_dev, · line 914

Quoted 2 lines
net/nfc/nci/core.c +2 -0
+		pr_err("Too many supported protocol by the device\n");
+		return -EINVAL;

I am pretty sure that you broke now NFC. Test the patches first and share your test scenario.

net/nfc/nci/core.c static int nci_activate_target(struct nfc_dev *nfc_dev, · line 917

Quoted 3 lines
net/nfc/nci/core.c +1 -0
+	}
 
 	if (!(nci_target->supported_protocols & (1 << protocol))) {

Best regards,
Krzysztof

#5 lore raw
In reply to Anup Sharma
Quoted 21 lines · Anup Sharma

syzbot found UBSAN: shift-out-of-bounds in nci_activate_target [1], when nci_target->supported_protocols is bigger than UNIT_MAX, where supported_protocols is unsigned 32-bit interger type.

32 is the maximum allowed for supported_protocols. Added a check for it.

[1] UBSAN: shift-out-of-bounds in net/nfc/nci/core.c:912:45 shift exponent 4294967071 is too large for 32-bit type 'int'

Call Trace:
 <TASK>
 __dump_stack lib/dump_stack.c:88 [inline]
 dump_stack_lvl+0x136/0x150 lib/dump_stack.c:106
 ubsan_epilogue lib/ubsan.c:217 [inline]
 __ubsan_handle_shift_out_of_bounds+0x221/0x5a0 lib/ubsan.c:387
 nci_activate_target.cold+0x1a/0x1f net/nfc/nci/core.c:912
 nfc_activate_target+0x1f8/0x4c0 net/nfc/core.c:420
 nfc_genl_activate_target+0x1f3/0x290 net/nfc/netlink.c:900
 genl_family_rcv_msg_doit.isra.0+0x1e6/0x2d0 net/netlink/genetlink.c:968
 genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline]
Quoted 4 lines

Also, no blank lines between tags.

Best regards,
Krzysztof

#2 lore raw
In reply to Krzysztof Kozlowski
Quoted 51 lines · Krzysztof Kozlowski
Quoted 2 lines · Anup Sharma

syzbot found UBSAN: shift-out-of-bounds in nci_activate_target [1], when nci_target->supported_protocols is bigger than UNIT_MAX,

UINT_MAX?

Quoted 1 line

where supported_protocols is unsigned 32-bit interger type.

integer?

Quoted 31 lines

32 is the maximum allowed for supported_protocols. Added a check for it.

[1] UBSAN: shift-out-of-bounds in net/nfc/nci/core.c:912:45 shift exponent 4294967071 is too large for 32-bit type 'int'

Call Trace:
 <TASK>
 __dump_stack lib/dump_stack.c:88 [inline]
 dump_stack_lvl+0x136/0x150 lib/dump_stack.c:106
 ubsan_epilogue lib/ubsan.c:217 [inline]
 __ubsan_handle_shift_out_of_bounds+0x221/0x5a0 lib/ubsan.c:387
 nci_activate_target.cold+0x1a/0x1f net/nfc/nci/core.c:912
 nfc_activate_target+0x1f8/0x4c0 net/nfc/core.c:420
 nfc_genl_activate_target+0x1f3/0x290 net/nfc/netlink.c:900
 genl_family_rcv_msg_doit.isra.0+0x1e6/0x2d0 net/netlink/genetlink.c:968
 genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline]
---
 net/nfc/nci/core.c | 5 +++++
 1 file changed, 5 insertions(+)
net/nfc/nci/core.c +0 -0
index fff755dde30d..e9d968bd1cd9 100644

net/nfc/nci/core.c static int nci_activate_target(struct nfc_dev *nfc_dev, · line 912

Quoted 5 lines
net/nfc/nci/core.c +2 -0
@@ -908,6 +908,11 @@ static int nci_activate_target(struct nfc_dev *nfc_dev,
 		pr_err("unable to find the selected target\n");
 		return -EINVAL;
 	}
+	
+	if (nci_target->supported_protocols >= 32) {

I don't think it makes any sense. How do you protect from UBSAN reported shift? Why supported_protocols cannot be 33? You are not shifting the supported_protocols...

Quoted 5 lines

net/nfc/nci/core.c static int nci_activate_target(struct nfc_dev *nfc_dev, · line 914

Quoted 2 lines
net/nfc/nci/core.c +2 -0
+		pr_err("Too many supported protocol by the device\n");
+		return -EINVAL;

I am pretty sure that you broke now NFC. Test the patches first and share your test scenario.

BTW, ISO15693 is here protocol 128, so definitely more than 32.

Best regards,
Krzysztof

#4 lore raw
In reply to a message not in the archive
Quoted 9 lines · Anup Sharma
Quoted 6 lines
Quoted 6 lines

net/nfc/nci/core.c static int nci_activate_target(struct nfc_dev *nfc_dev, · line 914

Quoted 3 lines
net/nfc/nci/core.c +2 -0
+		pr_err("Too many supported protocol by the device\n");
+		return -EINVAL;

I am pretty sure that you broke now NFC. Test the patches first and share your test scenario.

Since a reproducer for this bug is not available, I am unable to test it locally or through syzbot before submitting the patch.

Reproducer is only to test the actual issue, not test the code. Code can be tested with real device and maybe with virtual NCI driver.

Quoted 2 lines

Are there any other tests that
I can perform before submitting the patch, apart from simply compiling the kernel?

Compiling a kernel is not tested. Maybe you can test this part successfully with virtual NCI driver, maybe not, I don't know.

Quoted 11 lines
Quoted 3 lines

BTW, ISO15693 is here protocol 128, so definitely more than 32.

Thank you for your feedback. I would like to address the UBSAN bug and I have thought of a potential solution which involves adding a check statement for the minimum and maximum values of the protocol before net/nfc/nci/core.c +912:

if (!(nci_target->supported_protocols & (1 << protocol)))

Could you please assist me in determining the correct approach?

I would first propose to check whether the UBSAN report is an actual real issue to fix.

Best regards,
Krzysztof