From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A6B75E77171 for ; Wed, 4 Dec 2024 09:23:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 73AE610EC78; Wed, 4 Dec 2024 09:23:20 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="KOCycIW7"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id A332210E4BE; Wed, 4 Dec 2024 09:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733304199; x=1764840199; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=BWbXJDFaI8EgLty7YFvm7ppdf4GZ7oJgBPeaxZsl3yU=; b=KOCycIW7jNMWUhaEYJN5Elsbj9hAQwRKRUGT2MKofhrbnad4kRHh4sZe hqrEKRkCi95dJrofIeo1jQClT/GjLe1TEPEVnbqpr6p6RThWjKUR9snfN xOxrfMy0Zek2CBWeThgW5Fd7AHUfWNCmo8pTXJvhYWCdrXiLh9cEQ+xW+ Ll/HRehMU9z61oJL2X/GQr5WaszaR7m/WnqUq82bHUuE36ZkbVnCM4Uy2 +QlwPHvTrpL0PQmToCM0f7Ip5hoHvCdyqC195cjbvLdttxjpDwnItjx/5 Q1HxTFxw3ofbnAJk/hdpM9JP78BFSeXLtWThCO144CX5MOJstLA4JrJ1k g==; X-CSE-ConnectionGUID: wv2Ob7H1TVmofe0gKX+UUw== X-CSE-MsgGUID: gtpYVIwvRhSCfazgKnwadg== X-IronPort-AV: E=McAfee;i="6700,10204,11275"; a="50977936" X-IronPort-AV: E=Sophos;i="6.12,207,1728975600"; d="scan'208";a="50977936" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2024 01:23:19 -0800 X-CSE-ConnectionGUID: xC3LvTocSFKz5nyzjgXt6Q== X-CSE-MsgGUID: RIuRbvCDTeaBd0Ph9fTK3Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,207,1728975600"; d="scan'208";a="97770729" Received: from kuha.fi.intel.com ([10.237.72.152]) by fmviesa003.fm.intel.com with SMTP; 04 Dec 2024 01:23:15 -0800 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Wed, 04 Dec 2024 11:23:14 +0200 Date: Wed, 4 Dec 2024 11:23:14 +0200 From: Heikki Krogerus To: Lucas De Marchi Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Thomas =?iso-8859-1?Q?Wei=DFschuh?= , chaitanya.kumar.borah@intel.com, Luca Coelho Subject: Re: [PATCH] usb: typec: ucsi: Fix connector status writing past buffer size Message-ID: References: <20241203200010.2821132-1-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241203200010.2821132-1-lucas.demarchi@intel.com> X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Tue, Dec 03, 2024 at 12:00:10PM -0800, Lucas De Marchi wrote: > Similar to commit 65c4c9447bfc ("usb: typec: ucsi: Fix a missing bits to > bytes conversion in ucsi_init()"), there was a missing conversion from > bits to bytes. Here the outcome is worse though: since the value is > lower than UCSI_MAX_DATA_LENGTH, instead of bailing out with an error, > it writes past the buffer size. > > The error is then seen in other places like below: > > Oops: general protection fault, probably for non-canonical address 0x891e812cd0ed968: 0000 [#1] PREEMPT SMP NOPTI > CPU: 3 UID: 110 PID: 906 Comm: prometheus-node Not tainted 6.13.0-rc1-xe #1 > Hardware name: Intel Corporation Lunar Lake Client Platform/LNL-M LP5 RVP1, BIOS LNLMFWI1.R00.3222.D84.2410171025 10/17/2024 > RIP: 0010:power_supply_get_property+0x3e/0xe0 > Code: 85 c0 7e 4f 4c 8b 07 89 f3 49 89 d4 49 8b 48 20 48 85 c9 74 72 49 8b 70 18 31 d2 31 c0 eb 0b 83 c2 01 48 63 c2 48 39 c8 73 5d <3b> 1c 86 75 f0 49 8b 40 28 4c 89 e2 89 de ff d0 0f 1f 00 5b 41 5c > RSP: 0018:ffffc900017dfa50 EFLAGS: 00010246 > RAX: 0000000000000000 RBX: 0000000000000011 RCX: c963b02c06092008 > RDX: 0000000000000000 RSI: 0891e812cd0ed968 RDI: ffff888121dd6800 > RBP: ffffc900017dfa68 R08: ffff88810a4024b8 R09: 0000000000000000 > R10: 0000000000000000 R11: 0000000000000000 R12: ffffc900017dfa78 > R13: ffff888121dd6800 R14: ffff888138ad2c00 R15: ffff88810c57c528 > FS: 00007713a2ffd6c0(0000) GS:ffff88846f380000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 000000c0004b1000 CR3: 0000000121ce8003 CR4: 0000000000f72ef0 > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000ffff07f0 DR7: 0000000000000400 > PKRU: 55555554 > Call Trace: > > ? show_regs+0x6c/0x80 > ? die_addr+0x37/0xa0 > ? exc_general_protection+0x1c1/0x440 > ? asm_exc_general_protection+0x27/0x30 > ? power_supply_get_property+0x3e/0xe0 > power_supply_hwmon_read+0x50/0xe0 > hwmon_attr_show+0x46/0x170 > dev_attr_show+0x1a/0x70 > sysfs_kf_seq_show+0xaa/0x120 > kernfs_seq_show+0x41/0x60 > > Just use the buffer size as argument to fix it. > > Fixes: 226ff2e681d0 ("usb: typec: ucsi: Convert connector specific commands to bitmaps") > Signed-off-by: Lucas De Marchi Reviewed-by: Heikki Krogerus > --- > drivers/usb/typec/ucsi/ucsi.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c > index c435c0835744a..69caae84879e9 100644 > --- a/drivers/usb/typec/ucsi/ucsi.c > +++ b/drivers/usb/typec/ucsi/ucsi.c > @@ -651,7 +651,8 @@ static void ucsi_unregister_altmodes(struct ucsi_connector *con, u8 recipient) > static int ucsi_get_connector_status(struct ucsi_connector *con, bool conn_ack) > { > u64 command = UCSI_GET_CONNECTOR_STATUS | UCSI_CONNECTOR_NUMBER(con->num); > - size_t size = min(UCSI_GET_CONNECTOR_STATUS_SIZE, UCSI_MAX_DATA_LENGTH(con->ucsi)); > + size_t size = min(sizeof(con->status), > + UCSI_MAX_DATA_LENGTH(con->ucsi)); > int ret; > > ret = ucsi_send_command_common(con->ucsi, command, &con->status, size, conn_ack); > -- > 2.47.0 -- heikki