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 34A8A2EB0B; Mon, 1 Apr 2024 16:57:11 +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=1711990631; cv=none; b=PPb6grpMmWv82VDdopFyTB9irW7ICF1GxCx3UtKfI9GkvukxwqGm7WLeaTtlF1ouXaZTnDqA82he+9ifp0mhWQ4Ms/SdqicslfDVhF8Ry1T1emYYnEE7GI9XUL+gSEbaQKjuspaocRnyFBzpliW3U6i4wmt+IW2w2rNQML4UlnA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711990631; c=relaxed/simple; bh=AWR5Kp1QmDzMqKlxsqvdAYV776EXloY2MU2mLnP6A5g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Urrpjqe8jVKcv07MbQp518sgeztoDlSN67OflSjg3cV5+c3UzHPo4zlt5ZyxxkbKu6V+88HF4Yo0DIdftbUxKrHg8EhufXwTNLPVaX7hrMRH8WGu5rTfC/0Otnii1XXgwvqJxBs+SW+aD0a161+VVNlg7Buak2uYOFxAhhMFJa0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wn0Vjn9h; 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="wn0Vjn9h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9011DC433F1; Mon, 1 Apr 2024 16:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711990631; bh=AWR5Kp1QmDzMqKlxsqvdAYV776EXloY2MU2mLnP6A5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wn0Vjn9hdforFnvSgfCvKdAJdRzXG3SnUBY8ZC6qLdJlXUgIBI0yIeA1kcVA250Ti igLqNyopMQSnhwUoLs0VkIxj/4Es/dnTYG/sEcwpcSCDINv9TceQ9nTdVfdjp7jL7Q lmB+G0RuOC4ltkv3TMWioAZX2tFcUHI/Jl0oFg0M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Shevchenko , Hugo Villeneuve , Sasha Levin Subject: [PATCH 6.1 018/272] serial: max310x: fix NULL pointer dereference in I2C instantiation Date: Mon, 1 Apr 2024 17:43:28 +0200 Message-ID: <20240401152530.890393603@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152530.237785232@linuxfoundation.org> References: <20240401152530.237785232@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hugo Villeneuve [ Upstream commit 0d27056c24efd3d63a03f3edfbcfc4827086b110 ] When trying to instantiate a max14830 device from userspace: echo max14830 0x60 > /sys/bus/i2c/devices/i2c-2/new_device we get the following error: Unable to handle kernel NULL pointer dereference at virtual address... ... Call trace: max310x_i2c_probe+0x48/0x170 [max310x] i2c_device_probe+0x150/0x2a0 ... Add check for validity of devtype to prevent the error, and abort probe with a meaningful error message. Fixes: 2e1f2d9a9bdb ("serial: max310x: implement I2C support") Cc: stable@vger.kernel.org Reviewed-by: Andy Shevchenko Signed-off-by: Hugo Villeneuve Link: https://lore.kernel.org/r/20240118152213.2644269-2-hugo@hugovil.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/max310x.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 444f89eb2d4b7..d409ef3887212 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -1633,13 +1633,16 @@ static unsigned short max310x_i2c_slave_addr(unsigned short addr, static int max310x_i2c_probe(struct i2c_client *client) { - const struct max310x_devtype *devtype = - device_get_match_data(&client->dev); + const struct max310x_devtype *devtype; struct i2c_client *port_client; struct regmap *regmaps[4]; unsigned int i; u8 port_addr; + devtype = device_get_match_data(&client->dev); + if (!devtype) + return dev_err_probe(&client->dev, -ENODEV, "Failed to match device\n"); + if (client->addr < devtype->slave_addr.min || client->addr > devtype->slave_addr.max) return dev_err_probe(&client->dev, -EINVAL, -- 2.43.0