From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) (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 69655148FF9 for ; Sat, 11 Jan 2025 18:18:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736619489; cv=none; b=MeRCC+toTdxaePxyz2hS1dExDzMpXn9Cu1NtXEaX0Zwo/C68yyPh70KXucup8fmUudpviMDAOZv4MGhrzLMyrqYCKBk6iYmuZBC5ARrOExWuj4XFwvVaGtmFr1IHHT69ad8/xrmkhvdMwa2e74MCncTAwsgIZg/LnzTSMakNnX4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736619489; c=relaxed/simple; bh=s62mvwZEff+Un9ZX2XT3zfh4AVZB3cRWYFjvPlQuQKs=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=iVPom6MXj+Xczeg3ZTYoYcEYZI3mED9bL4pl75xL6kzcQ9J8NoITmjuczrk5K+9Fv/rB7CIhYpjAyMZNNAUgufREZD/oqb0qCpGtqf/UH/2GsjbJ/ydG3A4TkD7eTFuYM32fzqp3F4+Shv2kk5dRuEG//JHQDnwMQr5N0Ysjvo8= 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=nfnASZq9; arc=none smtp.client-ip=209.85.166.52 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="nfnASZq9" Received: by mail-io1-f52.google.com with SMTP id ca18e2360f4ac-844d6215ca9so7267439f.3 for ; Sat, 11 Jan 2025 10:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736619487; x=1737224287; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=y1oRc9cZoBgX5v3i2JTfvO9fczNSPTn6Ncch1aNDoyo=; b=nfnASZq9XhIDJfRDZ9SNbJOnXY38ARb5pNYmUfQi2zG5d5oJUIUtHLdkRbdCGAgS5D TwB8ZjpyORAlngS2/Lxp/innd25lhhmItSxGh+roJIvF8yKvEU95LRfq3GPRhuKP48iS xNzOdAHGs+iqhILOZS8HkgIGVVWXRJVwGCIRca+b5FteNM4p7yd78HAFw6UbOMbkjG7t Q73uLJ1+nzbaLagkyv4q2TzRrzfpmSB6unlJAmHA7WpiB0OUQudxBIuFWXG96MpTkirH FJet6qcJR4rqONcy154l5I+mGJK+T6fsIixFxljRcrx3+6kCBEonlKhLkYj+9atQhg6C kidw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736619487; x=1737224287; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=y1oRc9cZoBgX5v3i2JTfvO9fczNSPTn6Ncch1aNDoyo=; b=lSAn17mRic9WzVrTuv3nFG3FlGnLH6Y4TNN2sYd018sjpxxDZsCV10MU3unF5i+dml jmdp1QHeVa9e4s9P1Iwp3yex6nJraLnovTLer+wMOkRF/JYhU46NK/Wx2u5NLX5nFWN1 v/AA3ptXAVndicLm8Cfx9KBkqRowgAhQ9012mibiOoAf8A9s/J8JrlyePerEhSrb8nMq clSndFbCPNlP09VriU8ozEw3D53QY4em9JnghdbzkNetHv5xZA4b8kDEqLUpJvhIGOUn KNxCpSiZBMqz+273bpFkWnb5edf6m4fkUHE8NYwSZuuEqaKUfp9Y1v1MMr5S/dKQ4HRZ AipQ== X-Gm-Message-State: AOJu0YxhBRMrMGB1VNBF1ixFzTgPD58cOQ710T7++lcLoz6WlTwVRrwk fgO5rpMrQdp1SODjl0dKTq0JItx98KuapQBRQQaYZ4r25HmRi2urOoW1 X-Gm-Gg: ASbGncsBOuHaHSWpM4JRbPSbAZ+1mj4iElpcNcHfShzV1Q7TTQGkHdgirOvNzJmTbaJ 1+pPapFlh6s9VASvxbE6oQQ3eHTN3nrTnHRvdXl2eVy461iB99qtEEK1MNrX+nKtGlpqOjrC1AV PKCt1vn/+FQkkFbQwzwLUV/GMuBMck5zhJUQdfbCH4+TVtb17vLN2EgyzyPCLE7nQAtRjjGq619 uu21WrL3mHmVFgyQ4iHm72Z7KshFif+ePFCtTfKtXrQ5yEZXPBeTQ== X-Google-Smtp-Source: AGHT+IE6+ajgoUontHokd7R5AVAXdB27Gakc9cfkM9vKRyJpmzn2mAYzKvWSOnPPOUquEeawfJtbCQ== X-Received: by 2002:a05:6602:4014:b0:84f:1edd:efde with SMTP id ca18e2360f4ac-84f1eddf88amr199812439f.1.1736619487429; Sat, 11 Jan 2025 10:18:07 -0800 (PST) Received: from ise-alpha.. ([2620:0:e00:550a:642:1aff:fee8:511b]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4ea1b5fa2d2sm1655974173.30.2025.01.11.10.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jan 2025 10:18:06 -0800 (PST) From: Chenyuan Yang To: krzk@kernel.org, cj.winklhofer@gmail.com Cc: linux-kernel@vger.kernel.org, zijie98@gmail.com, Chenyuan Yang Subject: [PATCH] w1: fix NULL pointer dereference in probe Date: Sat, 11 Jan 2025 12:18:03 -0600 Message-Id: <20250111181803.2283611-1-chenyuan0y@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The w1_uart_probe() function calls w1_uart_serdev_open() (which includes devm_serdev_device_open()) before setting the client ops via serdev_device_set_client_ops(). This ordering can trigger a NULL pointer dereference in the serdev controller's receive_buf handler, as it assumes serdev->ops is valid when SERPORT_ACTIVE is set. This is similar to the issue fixed in commit 5e700b384ec1 ("platform/chrome: cros_ec_uart: properly fix race condition") where devm_serdev_device_open() was called before fully initializing the device. Fix the race by ensuring client ops are set before enabling the port via w1_uart_serdev_open(). Fixes: a3c08804364e ("w1: add UART w1 bus driver") Signed-off-by: Chenyuan Yang --- drivers/w1/masters/w1-uart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/w1/masters/w1-uart.c b/drivers/w1/masters/w1-uart.c index a31782e56ba7..c87eea347806 100644 --- a/drivers/w1/masters/w1-uart.c +++ b/drivers/w1/masters/w1-uart.c @@ -372,11 +372,11 @@ static int w1_uart_probe(struct serdev_device *serdev) init_completion(&w1dev->rx_byte_received); mutex_init(&w1dev->rx_mutex); + serdev_device_set_drvdata(serdev, w1dev); + serdev_device_set_client_ops(serdev, &w1_uart_serdev_ops); ret = w1_uart_serdev_open(w1dev); if (ret < 0) return ret; - serdev_device_set_drvdata(serdev, w1dev); - serdev_device_set_client_ops(serdev, &w1_uart_serdev_ops); return w1_add_master_device(&w1dev->bus); } -- 2.34.1