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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58AA5CDB474 for ; Mon, 23 Oct 2023 11:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233811AbjJWLVe (ORCPT ); Mon, 23 Oct 2023 07:21:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233818AbjJWLVe (ORCPT ); Mon, 23 Oct 2023 07:21:34 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B72AC1 for ; Mon, 23 Oct 2023 04:21:32 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B038AC433C7; Mon, 23 Oct 2023 11:21:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1698060092; bh=tLupdmBeiR28xtA3L+BbwkL3eWItcOxoUONOH+xWYp0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PJPryWCwmum5IAIp/q770EEYmPyT+mUH/eDr6PuPKZl7+vAKk1dY6D/Pw8Wr1tI6F 2Pn4K9eF7rKgQowIa98ERw4yKHvWQPk4oxldA4luvIsLD4ArTwbdi3+9/1HPEAUjsk 6+zwLVmuEHuKBjyl2OU/0G0A6mu8AlepyfRD+tSU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marc Kleine-Budde , Johan Hovold , Mark Brown Subject: [PATCH 6.1 019/196] regmap: fix NULL deref on lookup Date: Mon, 23 Oct 2023 12:54:44 +0200 Message-ID: <20231023104829.031149949@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231023104828.488041585@linuxfoundation.org> References: <20231023104828.488041585@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit c6df843348d6b71ea986266c12831cb60c2cf325 upstream. Not all regmaps have a name so make sure to check for that to avoid dereferencing a NULL pointer when dev_get_regmap() is used to lookup a named regmap. Fixes: e84861fec32d ("regmap: dev_get_regmap_match(): fix string comparison") Cc: stable@vger.kernel.org # 5.8 Cc: Marc Kleine-Budde Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20231006082104.16707-1-johan+linaro@kernel.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/base/regmap/regmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1572,7 +1572,7 @@ static int dev_get_regmap_match(struct d /* If the user didn't specify a name match any */ if (data) - return !strcmp((*r)->name, data); + return (*r)->name && !strcmp((*r)->name, data); else return 1; }