Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2573046lqp; Mon, 25 Mar 2024 03:07:30 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUNB9mG/5Mn35rQ2UaOED5ceElXFlBx6AKF25V6DNNe/YhrHvuz0ybvwJRYSLNRff4ZLpO4t6B59FA9DPEdl54utHU84uKJYErBmHMl5Q== X-Google-Smtp-Source: AGHT+IFI2Yx3gFgTUdtoK9X+a/2AErHf2qNL/szaoBtGbvJvTc4OjuNRj/tvwMghh3d4sg1Q/dMg X-Received: by 2002:ac8:7e94:0:b0:431:4f1c:f5e7 with SMTP id w20-20020ac87e94000000b004314f1cf5e7mr4529916qtj.29.1711361250227; Mon, 25 Mar 2024 03:07:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711361250; cv=pass; d=google.com; s=arc-20160816; b=AcYQ9iooE5ArzJ8peBxV/37IZitQMkOWWe7ADCsCpDQV5Cf3pA0FU0O6jeItHaRsnN 7KqWQZZnk1otFohWFwRuICUw/sUBnG/N9mP5a6jSh2DXb73I/yzla7FU58xjVp61jP+T G/5+QAa4mrBGVujn0ZI4VRHbdnvo0cMFn5WwqDiLTx8776DKlLiT7AorqS5LLY+cQRj3 V4mlrVspBZCiNjVz1cncBK2G6ioWUk7FhIhl0pkqv67JY4g8XLIrlQ+1Ykj2MTxQuVvu BXNOHAXbDZWup6MESpkePs5VXITsFkS3a8gJDXJYxboGJyI8emSXDWeSjQs53RJ6KVW6 niqA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=WYCxuNG2v+wXPUeiivXnlzsGDGx+IKKotWFyMFFtJZU=; fh=ijbpnWYVbrBDvLDSG+ZeUdzKsrwT4UULIjxtWEKt1Qw=; b=D3D9YtrlmNle588YHmxpFBLIJMaJB7Ep6ucjv7XOfS1+1ZRKo+4P8YAHtzenstxsUQ zW7jTcvLlsnccuZNvbNTPLmhfZgWes/WaXA0x88WRIaHynlL9CkViLpqEBvqcxQPDNcN QuxHp/eEkmFONqrjrGPdHLhVqqlva0KEh3RxTLZVQectD9FJJ4tgs8PtI9H2GVLtC6sd rW0ef8FnqJx8O2kR0LQpye+FYVtb7k03X3PFAhtgAtumhl6z9dKDWs3X4UExbUpNbKBU Bcbkee4qK9vQ+WBwu3QV7SMay93DpTjlFIYaS3YOIkvpeFJtdnXm5dbJ3G/Z/jgUkOjs g6PQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nIejtj2H; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116109-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116109-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id h1-20020ac87d41000000b0043157dd4dddsi1662488qtb.631.2024.03.25.03.07.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 03:07:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116109-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nIejtj2H; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116109-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116109-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 9D4091C2C8A4 for ; Mon, 25 Mar 2024 10:07:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 57247229BFF; Mon, 25 Mar 2024 03:31:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nIejtj2H" 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 EFFB6179943; Sun, 24 Mar 2024 23:40:09 +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=1711323611; cv=none; b=XGVVjgRRjcrNKzO0Czf3aRQ0C9OkLhFhIYd+u2umcPG59oSYp7u8hmy5X502RdTe2WxJukrgtOWQv/M8XgXZGSZKa7xRZehcBWN9Suz7ZnEkl1Ve/e+pPjXtDmNCyEmzWYEKxsb84ofO44XMSzXGEGfAji/5el+uHTNKeRH30iw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323611; c=relaxed/simple; bh=N9J+Q87Gpl6PopGY52TYfWuXItc8bHDolFg3pSYC4uA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=inT4Yw9coeBbtDxnN1LwoodY2zzF6vUB6SNYeShbsdeQA7+O6zXq+sfcKUGa41kT7jt8tedP8TmsvrV0r7hIGsvhwKUatV7R8Ka5Xc/0kHQFdlpQS8C2fz1Rae84x53xfZn1IvKeCQhkmGEWZ0kaDcG2yGoBuJQYvs64dc3IiZw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nIejtj2H; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C9A9C43394; Sun, 24 Mar 2024 23:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323609; bh=N9J+Q87Gpl6PopGY52TYfWuXItc8bHDolFg3pSYC4uA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nIejtj2HxIOzRyS2XObCvb4sku/uec0wHOtXq4fGuXjeFqMdS2E2EbMq6GeDyTt4V 4qy7XgTfWFv7NCTGdgfZYL5sQwy+EtfqAmL1hsz00JbL7lvX8+AG6WVaHwb9TKOEu2 /MvVBfcvkZ81EJydFxS3ea+ar+dPVfO7bMnSj4m562WrXGcbnLn9dNebinmQdXkSTh jfYVxl31hLxLsXfQAnP8QIu41iIm2QnwKcRVMwAsyIwPwWSWq+0YKh2hoXXmp1w6ab viYVUMt9REXhP8EP1/dZpmpMTES3yYvHKaJp+EBu/TivophXyYI71GWYpmCxT6JzJR VyaOYMIdK1/RQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marek Vasut , kernel test robot , Dan Carpenter , Mark Brown , Sasha Levin Subject: [PATCH 5.15 316/317] regmap: Add missing map->bus check Date: Sun, 24 Mar 2024 19:34:56 -0400 Message-ID: <20240324233458.1352854-317-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324233458.1352854-1-sashal@kernel.org> References: <20240324233458.1352854-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Marek Vasut [ Upstream commit 5c422f0b970d287efa864b8390a02face404db5d ] The map->bus can be NULL here, add the missing NULL pointer check. Fixes: d77e745613680 ("regmap: Add bulk read/write callbacks into regmap_config") Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Marek Vasut Cc: Dan Carpenter Cc: Mark Brown To: linux-kernel@vger.kernel.org Link: https://lore.kernel.org/r/20220509003035.225272-1-marex@denx.de Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/base/regmap/regmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 6adb345866610..893b0615935e9 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1836,7 +1836,7 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg, map->format.reg_bytes + map->format.pad_bytes + val_len); - else if (map->bus->gather_write) + else if (map->bus && map->bus->gather_write) ret = map->bus->gather_write(map->bus_context, map->work_buf, map->format.reg_bytes + map->format.pad_bytes, -- 2.43.0