From: Guanglei Zhu <zhugl3@xiaopeng.com>
To: dmitry.torokhov@gmail.com
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
liuc63@xiaopeng.com
Subject: [PATCH v3] Input: joydev - avoid signed overflow in the broken-axis correction
Date: Wed, 4 Nov 2026 13:50:58 +0800 [thread overview]
Message-ID: <20261104055058.854710-1-zhugl3@xiaopeng.com> (raw)
In-Reply-To: <8063a24bb9f75bb9096c947d8ffa7123@gmail.com>
The JS_CORR_BROKEN correction multiplies two 32-bit values taken
from user space via JSIOCSCORR before shifting and clamping:
value = value > corr->coef[0] ? (value < corr->coef[1] ? 0 :
((corr->coef[3] * (value - corr->coef[1])) >> 14)) :
((corr->coef[2] * (value - corr->coef[0])) >> 14);
Nothing bounds the coefficients, so with large enough values the
products wrap around and the correction returns bogus axis values
for the rest of the session.
Compute the correction in 64 bits and clamp once, and flatten the
nested ternary so the dead zone returns 0 directly.
Signed-off-by: Guanglei Zhu <zhugl3@xiaopeng.com>
---
v3: rework per review - pre-convert value to s64 and use if/else
instead of the nested ternary with explicit casts, return 0
directly from the dead zone, and clamp once instead of passing
the value through the trailing clamp a second time; drop Fixes
and the stable backport request since the kernel is built with
-fno-strict-overflow and this only affects synthetic
coefficients passed via JSIOCSCORR.
drivers/input/joydev.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 32459fd..fbc6e77 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -67,22 +67,27 @@ struct joydev_client {
static int joydev_correct(int value, struct js_corr *corr)
{
+ s64 v64;
+
switch (corr->type) {
case JS_CORR_NONE:
- break;
+ return clamp(value, -32767, 32767);
case JS_CORR_BROKEN:
- value = value > corr->coef[0] ? (value < corr->coef[1] ? 0 :
- ((corr->coef[3] * (value - corr->coef[1])) >> 14)) :
- ((corr->coef[2] * (value - corr->coef[0])) >> 14);
- break;
+ v64 = value;
+ if (value < corr->coef[0])
+ v64 = (v64 - corr->coef[0]) * corr->coef[2];
+ else if (value > corr->coef[0] && value > corr->coef[1])
+ v64 = (v64 - corr->coef[1]) * corr->coef[3];
+ else
+ return 0;
+
+ return clamp_val(v64 >> 14, -32767, 32767);
default:
return 0;
}
-
- return clamp(value, -32767, 32767);
}
static void joydev_pass_event(struct joydev_client *client,
--
2.43.0
next prev parent reply other threads:[~2026-11-04 5:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-03 8:41 [PATCH] Input: joydev - avoid an undefined shift in the legacy 0x read Guanglei Zhu
2026-11-03 8:41 ` [PATCH] Input: joydev - avoid signed overflow in the broken-axis correction Guanglei Zhu
2026-11-03 8:55 ` [PATCH v2] " Guanglei Zhu
2026-11-04 3:38 ` Dmitry Torokhov
2026-11-04 5:50 ` Guanglei Zhu [this message]
2026-11-04 6:02 ` [PATCH v3] " Guanglei Zhu
2026-11-03 8:41 ` [PATCH] Input: adi - bound the two-stream packet merge Guanglei Zhu
2026-11-03 11:17 ` [PATCH v2] " Guanglei Zhu
2026-11-03 8:41 ` [PATCH] Input: db9 - enlarge the Saturn multitap packet buffer Guanglei Zhu
2026-11-03 8:41 ` [PATCH] Input: lpc32xx-keys - reject matrices bigger than the hardware has Guanglei Zhu
2026-11-03 18:54 ` Dmitry Torokhov
2026-11-04 3:07 ` [PATCH v2] " Guanglei Zhu
2026-11-04 6:25 ` Dmitry Torokhov
2026-11-03 8:41 ` [PATCH] Input: mt6779-keypad - check the reported row and column Guanglei Zhu
2026-11-03 8:41 ` [PATCH] Input: tegra-kbc - check the pin numbers from the device tree Guanglei Zhu
2026-11-03 8:41 ` [PATCH] Input: cyapa_gen3 - clamp the reported finger count to the array Guanglei Zhu
2026-11-03 18:45 ` [PATCH] Input: joydev - avoid an undefined shift in the legacy 0x read Dmitry Torokhov
2026-11-04 3:07 ` [PATCH v2] " Guanglei Zhu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261104055058.854710-1-zhugl3@xiaopeng.com \
--to=zhugl3@xiaopeng.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liuc63@xiaopeng.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®