From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f176.google.com (mail-dy1-f176.google.com [74.125.82.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BDE42FE575 for ; Sun, 14 Jun 2026 21:02:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781470953; cv=none; b=A+KWPFcu9U1uOEh4s2MvTLjvwk4YK3Ulsrrf0And7L0+oQhVA4z1xOcr3H0NXdJ/y1u4fSa9bx0Dn5gL36aHHNzMy0gSRg1bSGvHpJ8/S1DyUi3ePSiYsvTML8iDRTDJPJhqENcQKj5I++JiOIbvubuTzpJCi3N0DiUMwou7IPY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781470953; c=relaxed/simple; bh=x6aSa9JJXzS00dkyGLgJ2CN2Oxn6FztU+snpGmhBF6w=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=qgVreolwgQ1VZeLnv58nDMf28uiiANXC3hfZy0/jvYD6zlDU44Sz2qME07PigQ7x+WdGu79OJkAKsyqNyIc1jcDXX1L67NE53C3kbQIq9s6UWx02jVG1XwDm9CzlNueR2M5KAszxztP5x3Y+Mzf6eYLk3cuXQeyOlTAUIuEM0Ak= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kHp4ltlg; arc=none smtp.client-ip=74.125.82.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kHp4ltlg" Received: by mail-dy1-f176.google.com with SMTP id 5a478bee46e88-304e83724bfso3721958eec.0 for ; Sun, 14 Jun 2026 14:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781470951; x=1782075751; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=P6pjKUaBePg5CFHf82pDzWAMLUnqsWDn4jvKoQ98y1E=; b=kHp4ltlgFRn/uueEVzhRPI0+W+8BKVw1WORhK4tSX2XHEeIclE3tJd0oOpgi9vXkmA xvar1OJ45NyKer+LiEg4o8nRayP0KHp7IOsNVBLEN1M9VT2CdSOVqNH0kyyHAq8J3j4s 1Ht4pbZObi3fHz6YAfM8MS+CJxXIyXkCXztPpYrgxotZ6KAAzuWtOWyoN6EfODsjndvB 09MHAuEim18ku9qyGId6wvj+RgWnATOFU2GEhO0+QDqc22rS5rj9GPHcl2SeV6EsiA4Q 5za926dGyCxH95N9dgFR4hTHjrlRMzG+UuRI3d5DxMbr6PwkASox+mBbZ+YHFffQsWp2 mi+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781470951; x=1782075751; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P6pjKUaBePg5CFHf82pDzWAMLUnqsWDn4jvKoQ98y1E=; b=EHff9s15wvIsCUlYrZb8jOcTHyySKOGgK2a+cC4ihlgJJ1V/fvoHV53xKhr7boaXLZ ltuRrippn08srP6SJUIb0dChjT8io4d4/jPRSyQLuiRs1wFTDrLHzs8BVDcCcaRetgfR 77YD8HZQ0rykLsaVpeJ64MF5tv/233zh6+dOqZRWXIhh7VqVqdIWow57mXP6FIHeffph 5lsUVzgbe3FDLPCUoh6z+5cOAG5wK4jPKWBswdISTC0BhNJXK4q3FSP974aad7iT7ZjN L/l7189rRS6zvvsPi2hJY68DkY8qj1U+0QxniYoc2NYX4JvC+ArQhQOcnDtssKkxvtxw gU2w== X-Forwarded-Encrypted: i=1; AFNElJ/wO/nYKJ9V/LFzXNzs1EGguWmu0+EppJ/VPdCZt7Fpb2ZwI5DPf7I68p3N7PTyeL9wks5jprBbEevXOb0=@vger.kernel.org X-Gm-Message-State: AOJu0YwU6YaJdh5BYJG9Sb70nk9wwQvTnHQRRCvRq5HEKTxhPsGaN3BE eH3+zw5BSKps/0IPwSIgfe0RwBkOtodFvpDFhjRI7HGGXAMlVDZYKQ5B X-Gm-Gg: Acq92OGD7j/pAz/jwnIKepiS4fotAN+U0DXV8cyOp9ky4dfQ6ytYQfwiNI8iwJDfBmT bojd8PoU+6JZshkwhegS138jqcIYWeAqF3xLbJOhnlkUiN6fQKfOAoNKk9P6Bq49lKHLmDarEUp czoFxiPaVvNxKWS2zsphQCkfrCVS5hONcipONRCEXu4LhwHI7lHUsR0tUz+1VrcMuebHnoGLi85 FjXvzJi2/D4p5E5qZX3em9OvS6riNbvgCLU8MmWWQQS+tBR7UeZx83jJaGPN32uunppwwajSGPh D69Q1F/KlkO0ryhlf5p28+W3Wd1slxT54hf1U4ZrjKkpp6vxN21VnvQ7KqylH0UiMUb6/jOn1Ad 2u/bdRgJhiclF3jQZb7qBJRixZdv+D9UTUItqgg/3UePDgZ3tLjvgPpHJ1PqnndUtl+GK1YHBMk bqEpweWaq8sJfjHS4ihFtSPp0vI+c3ec3Qx2e35nQeobTP5ns94Qk+HQZHhm95mTTs X-Received: by 2002:a05:7300:aca5:b0:304:5b0d:489b with SMTP id 5a478bee46e88-30820098d2emr6469710eec.27.1781470951396; Sun, 14 Jun 2026 14:02:31 -0700 (PDT) Received: from google.com ([2a00:79e0:2ebe:8:5d91:5c26:602d:6a99]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081ea447b4sm11307856eec.23.2026.06.14.14.02.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2026 14:02:30 -0700 (PDT) Date: Sun, 14 Jun 2026 14:02:27 -0700 From: Dmitry Torokhov To: Hans de Goede Cc: hexlabsecurity@proton.me, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] Input: goodix - clamp the device-reported contact count Message-ID: References: <20260612-b4-disp-6844625d-v1-1-df0aed080c9d@proton.me> <6f529998-2b4f-441e-88be-fbc4eb33461c@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6f529998-2b4f-441e-88be-fbc4eb33461c@kernel.org> On Sun, Jun 14, 2026 at 01:44:07PM +0200, Hans de Goede wrote: > Hi, > > On 13-Jun-26 04:10, Bryam Vargas via B4 Relay wrote: > > From: Bryam Vargas > > > > goodix_ts_read_input_report() copies the number of touch points reported > > by the device into an on-stack buffer > > > > u8 point_data[2 + GOODIX_MAX_CONTACT_SIZE * GOODIX_MAX_CONTACTS]; > > > > which is sized for at most GOODIX_MAX_CONTACTS (10) contacts. The only > > runtime check bounds the per-interrupt count against ts->max_touch_num, > > but that value is taken verbatim from a 4-bit field of the device > > configuration block and is never clamped: > > > > ts->max_touch_num = ts->config[MAX_CONTACTS_LOC] & 0x0f; > > > > The nibble can be 0..15, so a malfunctioning, malicious or counterfeit > > controller (or an attacker tampering with the I2C bus) can advertise up > > to 15 contacts. goodix_ts_read_input_report() then accepts a touch_num > > of up to 15 and the second goodix_i2c_read() writes > > ts->contact_size * (touch_num - 1) bytes past the one-contact header into > > point_data - up to 30 bytes (45 with the 9-byte report format) beyond the > > 92-byte buffer: a stack out-of-bounds write. > > > > Clamp max_touch_num to GOODIX_MAX_CONTACTS, the number of contacts > > point_data[] is sized for, when reading it from the configuration. > > > > Fixes: a7ac7c95d468 ("Input: goodix - use max touch number from device config") > > Cc: stable@vger.kernel.org > > Signed-off-by: Bryam Vargas > > Thanks, patch looks good to me: > > Reviewed-by: Hans de Goede > > Regards, > > Hans > > > > --- > > drivers/input/touchscreen/goodix.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c > > index f8798d11ec03..17fcfe45988c 100644 > > --- a/drivers/input/touchscreen/goodix.c > > +++ b/drivers/input/touchscreen/goodix.c > > @@ -1057,7 +1057,8 @@ static void goodix_read_config(struct goodix_ts_data *ts) > > } > > > > ts->int_trigger_type = ts->config[TRIGGER_LOC] & 0x03; > > - ts->max_touch_num = ts->config[MAX_CONTACTS_LOC] & 0x0f; > > + ts->max_touch_num = min(ts->config[MAX_CONTACTS_LOC] & 0x0f, > > + GOODIX_MAX_CONTACTS); Should we drop the report if is has bogus data in it? Thanks. -- Dmitry