diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-10-03 07:46:50 -0700 |
|---|---|---|
| committer |   Benjamin Tissoires <bentiss@kernel.org> | 2024-10-04 10:37:09 +0200 |
| commit | ae9b956cb26c0fd5a365629f2d723ab2fb14df79 (patch) | |
| tree | 9b0449204bd2ecffb005154975812483234167e7 | |
| parent | HID: simplify code in fetch_item() (diff) | |
| download | wireguard-linux-ae9b956cb26c0fd5a365629f2d723ab2fb14df79.tar.xz wireguard-linux-ae9b956cb26c0fd5a365629f2d723ab2fb14df79.zip | |
HID: simplify snto32()
snto32() does exactly what sign_extend32() does, but handles
potentially malformed data coming from the device. Keep the checks,
but then call sign_extend32() to perform the actual conversion.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Link: https://patch.msgid.link/20241003144656.3786064-1-dmitry.torokhov@gmail.com
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/hid/hid-core.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 0dc3018de2a6..a6fe04e1c726 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1313,9 +1313,7 @@ alloc_err: EXPORT_SYMBOL_GPL(hid_open_report); /* - * Convert a signed n-bit integer to signed 32-bit integer. Common - * cases are done through the compiler, the screwed things has to be - * done by hand. + * Convert a signed n-bit integer to signed 32-bit integer. */ static s32 snto32(__u32 value, unsigned n) @@ -1326,12 +1324,7 @@ static s32 snto32(__u32 value, unsigned n) if (n > 32) n = 32; - switch (n) { - case 8: return ((__s8)value); - case 16: return ((__s16)value); - case 32: return ((__s32)value); - } - return value & (1 << (n - 1)) ? value | (~0U << n) : value; + return sign_extend32(value, n - 1); } s32 hid_snto32(__u32 value, unsigned n) |