From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AC35332900; Thu, 27 Nov 2025 14:59:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764255561; cv=none; b=i3h44bZFxKYt1BveCQeGSmV8hA3b0tDFqhwkLXkF65agyAy/dDxcnRpI4BjlMmHKcnMc98/kHZabQWEbe+uZMz7jCHwyk+9ae5iK+zLI3JuGTe4XNwhxiKURJ2O1ChX7uTXMdJKo7Ch61DhEglth0scVmCIPQxaOlTcen43zinc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764255561; c=relaxed/simple; bh=k0+OPwKEBz76sPlh6YmCqCXw30UMJN9ntGXbANxCZPs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=onZ8ynQtEU0IvQgIaGZpmUtnppxk7A83u/pt13UDgMamdy3mUr+HVz4XZKSACzKQWj3TjPFlZ8gGZggCauWGvoGEurfiYm/uZ94VXOE0sZjY5Z2bujn4CkPWxVoyRPPfWUXbqTDBw49BCn7XG5wLSmxkwzaO54ndasO3REIsw70= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AHBcDAIR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AHBcDAIR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A90FC113D0; Thu, 27 Nov 2025 14:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764255561; bh=k0+OPwKEBz76sPlh6YmCqCXw30UMJN9ntGXbANxCZPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AHBcDAIRNI6bOCQhN/rXupOkLTYWO+rXVB5n18lWlnijsyKanIe9v/klYYRpgcHNb mVGcNMEnPtVbtnjmmHP9joJN0KNAgiFzIqJtzrLrM88y/LHnJdSSkB8iRZWm8tiSvc +Xe/TDBJvEJwWJt80OGpBUB+58bn0h3AKWQN8Q7U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tzung-Bi Shih , Dmitry Torokhov Subject: [PATCH 6.17 036/175] Input: cros_ec_keyb - fix an invalid memory access Date: Thu, 27 Nov 2025 15:44:49 +0100 Message-ID: <20251127144044.284656963@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251127144042.945669935@linuxfoundation.org> References: <20251127144042.945669935@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tzung-Bi Shih commit e08969c4d65ac31297fcb4d31d4808c789152f68 upstream. If cros_ec_keyb_register_matrix() isn't called (due to `buttons_switches_only`) in cros_ec_keyb_probe(), `ckdev->idev` remains NULL. An invalid memory access is observed in cros_ec_keyb_process() when receiving an EC_MKBP_EVENT_KEY_MATRIX event in cros_ec_keyb_work() in such case. Unable to handle kernel read from unreadable memory at virtual address 0000000000000028 ... x3 : 0000000000000000 x2 : 0000000000000000 x1 : 0000000000000000 x0 : 0000000000000000 Call trace: input_event cros_ec_keyb_work blocking_notifier_call_chain ec_irq_thread It's still unknown about why the kernel receives such malformed event, in any cases, the kernel shouldn't access `ckdev->idev` and friends if the driver doesn't intend to initialize them. Signed-off-by: Tzung-Bi Shih Link: https://patch.msgid.link/20251104070310.3212712-1-tzungbi@kernel.org Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/keyboard/cros_ec_keyb.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/input/keyboard/cros_ec_keyb.c +++ b/drivers/input/keyboard/cros_ec_keyb.c @@ -261,6 +261,12 @@ static int cros_ec_keyb_work(struct noti case EC_MKBP_EVENT_KEY_MATRIX: pm_wakeup_event(ckdev->dev, 0); + if (!ckdev->idev) { + dev_warn_once(ckdev->dev, + "Unexpected key matrix event\n"); + return NOTIFY_OK; + } + if (ckdev->ec->event_size != ckdev->cols) { dev_err(ckdev->dev, "Discarded incomplete key matrix event.\n");