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 D0A1312C49C; Tue, 30 Apr 2024 10:44:46 +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=1714473886; cv=none; b=SbNcmsQdh4cTpJPrBPOHlr67kgfh/tE+bwddZffizu4Tz71Ubq09v4JtTd2D2jaxZLn6gwRwEo8rLbxyqsDpL5StkiTclGN8KDBTcJ2ib46xQnoluv4QlftCmg6bkcvhnRzmbktlHt1+X53YiUzOYb91zdVVTxxHYro3GSOWyYw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714473886; c=relaxed/simple; bh=uhjzMqo/PcgTF3CPi5JbUx0e0XG/cd+rxb+g6zig7ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f6hBSLX3xi+ZxlHEfiow+4xfE8oDnvMq7SR0p54//be1dnuaHu/dYoW1NyC1iEcF1irdklYdCUmhziv/Q+arrxYde3iJ+TaUIeh+CGffjTOfoRjzjjfMQVgrOzvVEb/4IS4r2l6APbLpgR+esBDIfPpiQ9AwQRU3TyRETfp0GNw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kb+zATHE; 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="kb+zATHE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57C16C2BBFC; Tue, 30 Apr 2024 10:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714473886; bh=uhjzMqo/PcgTF3CPi5JbUx0e0XG/cd+rxb+g6zig7ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kb+zATHEtxdJ1pnZFi3yVAH7RV2j6q7CS6oMEpTkkmtXJ4wLtSEFa3DMwE8OVmwy9 KzyEYd054G1lNd7WAR43ejJYOibSIdqeiBsKDuka17P0A9g6ryQxC9TMPLcWxzbhgB jeDHahYD9InxefXVm2fRjh1NGAcJ4jJx8eeoDAU8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Baruch Siach , Wolfram Sang , Sasha Levin Subject: [PATCH 4.19 72/77] i2c: smbus: fix NULL function pointer dereference Date: Tue, 30 Apr 2024 12:39:51 +0200 Message-ID: <20240430103043.265162617@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103041.111219002@linuxfoundation.org> References: <20240430103041.111219002@linuxfoundation.org> User-Agent: quilt/0.67 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wolfram Sang [ Upstream commit 91811a31b68d3765b3065f4bb6d7d6d84a7cfc9f ] Baruch reported an OOPS when using the designware controller as target only. Target-only modes break the assumption of one transfer function always being available. Fix this by always checking the pointer in __i2c_transfer. Reported-by: Baruch Siach Closes: https://lore.kernel.org/r/4269631780e5ba789cf1ae391eec1b959def7d99.1712761976.git.baruch@tkos.co.il Fixes: 4b1acc43331d ("i2c: core changes for slave support") [wsa: dropped the simplification in core-smbus to avoid theoretical regressions] Signed-off-by: Wolfram Sang Tested-by: Baruch Siach Signed-off-by: Sasha Levin --- drivers/i2c/i2c-core-base.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 9079be0d51d15..2bdb8bc4cc829 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -1872,13 +1872,18 @@ static int i2c_check_for_quirks(struct i2c_adapter *adap, struct i2c_msg *msgs, * Returns negative errno, else the number of messages executed. * * Adapter lock must be held when calling this function. No debug logging - * takes place. adap->algo->master_xfer existence isn't checked. + * takes place. */ int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { unsigned long orig_jiffies; int ret, try; + if (!adap->algo->master_xfer) { + dev_dbg(&adap->dev, "I2C level transfers not supported\n"); + return -EOPNOTSUPP; + } + if (WARN_ON(!msgs || num < 1)) return -EINVAL; -- 2.43.0