From patchwork Tue May 16 08:12:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 94507 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp262818vqo; Tue, 16 May 2023 01:23:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ49cqOGkLWPkbhZf+/RWyZ6X43Qob16zbOXAwD9YvUBLpELaeCPtHcVbfqgEcV7I/7YWCFR X-Received: by 2002:a17:90a:c004:b0:247:3e0a:71cd with SMTP id p4-20020a17090ac00400b002473e0a71cdmr35470315pjt.6.1684225395120; Tue, 16 May 2023 01:23:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684225395; cv=none; d=google.com; s=arc-20160816; b=cPP0v4jIpa8xvkAaLcQm7czw4XfqkBEHBWnNQJv01iOlU8NEOChatDDvRAXmXd+gn/ S0Nb0sSAR0Gz8k1ymIqkvQXcXgHsBQnKdIkC7yRm1KqH7kcruBjL7SmZ0u0ytzYWJgI9 I6o8OClfn5Vf7JOcVIqaU4oeHudslKpnzni2PBMDNFXAYNZGdGXLXRr+V8xWHT3j6m2c xRFuICeUntqiYg6yUn9VwXW6AEuJCRYfHiYGcDIV8Dk8eBcfU9Z6/FHg9ICy2S5GTA1b 2DkYSr5fZiSoHD3FsOG2ejmorM2yr7oMZR9Lw0Pr4ycPVYtDNVK8FjGaObAI8b9aZ0I6 lJCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=D9WQpX8umTNZT1uMb2NpjGwQWrLstlpv7/gcs4042jo=; b=MENaAHmv4i6Cqx8jTGNZQ+VdYd0LOTmG6JC0NuRICOpivq+2OrR1Y3EUJeMZkgN5DR MBe//N6Pv6X20vXzXQL5Iy8NVb/h2J2iRktBZcZdntS156v6thCIDYkZQ/B+AFThvJFY BilX7QLTmaqSijdkYFswsxfjMVbQoe7gEZ8LggrdYXLsDS6U2BiXU25NPMmNZ1YHilyO l/QPDADx31kiDGDTEkumdDVXzopoWSuR1Njtn2BM/wF3uydNK1Bd7D6jma0/+q7zDKYl Ng2kTsPBSMlxgRBqjtdBTbwWXMXcvbc7uufx/AcIiWeET4/MzE4Cno74fzu+hl1Ps99q 94Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bnfuz3Fz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go13-20020a17090b03cd00b0024b9e5aa258si17736862pjb.0.2023.05.16.01.23.00; Tue, 16 May 2023 01:23:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bnfuz3Fz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231570AbjEPIND (ORCPT + 99 others); Tue, 16 May 2023 04:13:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231579AbjEPINA (ORCPT ); Tue, 16 May 2023 04:13:00 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 820DF49DC for ; Tue, 16 May 2023 01:12:58 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f50020e0f8so15740415e9.0 for ; Tue, 16 May 2023 01:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684224777; x=1686816777; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=D9WQpX8umTNZT1uMb2NpjGwQWrLstlpv7/gcs4042jo=; b=bnfuz3FzUAPekyOCUVPSBs2VQGQNvFw2wLjvtwYrqBOE7GHXzarHw9sqLweKgCApYh AYbgyvBoeSd2q+POJlyCU32HL4NdVq4dvoKq4N2cE9eh321INKsHD0cMl+gB0IBcMDEB hho3cw8B7TPI/RjkMbkdAR1VIHLFOmw+wRkFWWqNTaGo9Ca5tkH2OuC8nVBeZG62O2EO B5KLFzlOyHaRT2shV7N0nlKY7UYAP/b8lfLF56VPvfPjxvjigPvsHNL6+HGHl2lY2WHS Z1SDZ87cxINgY/CQ05WKOPsWL/5CiP/Rptu0yyZhr31buWpwjwnvzBjP9dZM+BMbmQIj YRyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684224777; x=1686816777; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=D9WQpX8umTNZT1uMb2NpjGwQWrLstlpv7/gcs4042jo=; b=fqoedW/zXlUb4MM95984bGqs3QgOYykxN81+vUvqdHj3NsXq5yXh70Gbmd7AVx4Qjh In7MFXXLLIoOndGs3QbCi/1m6bdfAG0oUQe2pKweIWvHy7FOIJgnhQ0BIHqDbCT49BBl Z03iubbyIDhNLWl3vlk683RNrDLmvFKLFUB50mMxbO6H7QLTylgq+OYpYDUy1I8i9l04 zAaOLfPMy4oTELDFFUmEqA4eHgTpHoj+viIRe79JNiqqZBVr7r0lIxKEjvwk6UZVspUr eBAAfw7IUkyDI9RD/irG00Y50N5hUL2yZErz0ho7JWPXGOMVkini7lPSndls3EMNVjWg YwLw== X-Gm-Message-State: AC+VfDyKTkDoJxy4spPM/qAqeDd1ifO17RHA5v4VNM27EVpYdah02rXR /dnQgIh5S6yv21lJWpKYrrXajw== X-Received: by 2002:a5d:604b:0:b0:2fb:b869:bc08 with SMTP id j11-20020a5d604b000000b002fbb869bc08mr26741990wrt.23.1684224776867; Tue, 16 May 2023 01:12:56 -0700 (PDT) Received: from localhost ([102.36.222.112]) by smtp.gmail.com with ESMTPSA id v14-20020a1cf70e000000b003eddc6aa5fasm1418188wmh.39.2023.05.16.01.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 01:12:55 -0700 (PDT) Date: Tue, 16 May 2023 11:12:51 +0300 From: Dan Carpenter To: Amadeusz =?utf-8?b?U8WCYXdpxYRza2k=?= Cc: Luis Chamberlain , Russ Weight , Greg Kroah-Hartman , "Rafael J. Wysocki" , Cezary Rojewski , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] firmware_loader: Fix a NULL vs IS_ERR() check Message-ID: <36ef6042-ce74-4e8e-9e2c-5b5c28940610@kili.mountain> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766038327909319129?= X-GMAIL-MSGID: =?utf-8?q?1766038327909319129?= The crypto_alloc_shash() function doesn't return NULL, it returns error pointers. Update the check accordingly. Fixes: 02fe26f25325 ("firmware_loader: Add debug message with checksum for FW file") Signed-off-by: Dan Carpenter Reviewed-by: Cezary Rojewski Acked-by: Luis Chamberlain --- drivers/base/firmware_loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index 9d79d5ad9102..b58c42f1b1ce 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -812,7 +812,7 @@ static void fw_log_firmware_info(const struct firmware *fw, const char *name, st char *outbuf; alg = crypto_alloc_shash("sha256", 0, 0); - if (!alg) + if (IS_ERR(alg)) return; sha256buf = kmalloc(SHA256_DIGEST_SIZE, GFP_KERNEL);