wcmUSB: Correct bounds check of maximum button number #329
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Automated test runs have detected the following issue while running UBSan
checks:
~~~
../src/wcmUSB.c:1372:11: runtime error: left shift of 1 by 31 places cannot
be represented in type 'int'
#0 0x7f0444bcbd8c in mod_buttons ../src/wcmUSB.c:1372
linuxwacom#1 0x7f0444bd7f26 in test_mod_buttons ../src/wcmUSB.c:2090
linuxwacom#2 0x7f0444bfcea7 in wcm_run_tests ../test/wacom-test-suite.c:46
linuxwacom#3 0x56204d77b405 in main ../test/wacom-tests.c:44
linuxwacom#4 0x7f0448625082 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x24082)
linuxwacom#5 0x56204d77b1cd in _start (/home/runner/work/xf86-input-wacom/xf86-input-wacom/builddir/wacom-tests+0x11cd)
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior ../src/wcmUSB.c:1372:11 in
~~~
While the faulty line has some protection against an excessively-large
value of 'btn', the bounds are incorrect. A button number of 32 would
be allowed by the existing check but would also lead to undefined
behavior.
This commit modifies the bounds to properly fit the condition.
Link: https://github.com/linuxwacom/xf86-input-wacom/actions/runs/7049012015/job/19186502078
Signed-off-by: Jason Gerecke <[email protected]>
Pinglinux
reviewed
Nov 30, 2023
whot
approved these changes
Nov 30, 2023
|
merged, thanks! |
|
Ok, I'm still staring at this and... this can't be right, button 31 is a legitimate button so the issue is elsewhere - and I found it, see #330. Sorry about that, my brain didn't really switch on until after the merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automated test runs have detected the following issue while running UBSan checks:
While the faulty line has some protection against an excessively-large value of 'btn', the bounds are incorrect. A button number of 32 would be allowed by the existing check but would also lead to undefined behavior.
This commit modifies the bounds to properly fit the condition.
Link: https://github.com/linuxwacom/xf86-input-wacom/actions/runs/7049012015/job/19186502078