From patchwork Wed Dec 13 10:38:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 177850 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp7680821dys; Wed, 13 Dec 2023 02:39:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IERFEcxA4O2IxKyyoIjrJTKHF4e+uEIRgnO3CL174dcIEoNjVGE3DNCV7N2sLUJXoilgIZP X-Received: by 2002:a17:903:2647:b0:1d0:6ffd:e2e4 with SMTP id je7-20020a170903264700b001d06ffde2e4mr6869377plb.126.1702463950151; Wed, 13 Dec 2023 02:39:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702463950; cv=none; d=google.com; s=arc-20160816; b=abKK1DJYMO+WQngjqmO7cp/BCbdfc2vu0WZPR0uYWrcYusfRbeLO6vMZT/W5pJQt7w Hzxac/mAvqHWxuIOXHk1C0yOwyRofQDk8l7tdJuBFhu/Sp5mqlS+8lCrm7jva8TMDF4g 78P33Pw2lVfYOS6KRm/QO6Va+vjo+D+bcy5xIqG74gdb1y8r2MlSRWWNxS10EATD5/Uy kRfcq8roYztAk3EElgboK40hOb+fhEILmzyFnMsfG8jiqmfsgv+WPNr0TkYuJCFF8UrN fCz+I+qroLlnemsuacqWKfpECbERMDx/0PZUoaSzsfD8FFOMi3gvEwuqSD+CUOtRIGag /OUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:from:content-transfer-encoding :content-id:mime-version:subject:cc:to:organization:dkim-signature; bh=7rbywSJ96wW9dFZf5YYYGCHOwBB3IiK91ZMT119qoHk=; fh=RZG/LUxeilhIVWnmniumQJH9lxwrOxrVotbRF73uvus=; b=oRl60ojwNEbRIWNqFIJSd+YPck4bsDcX90DVhDzkpi9ALkch9/fUIzfN5pbTo+JRUV Sm63Ji/wr7042n4IX1GRMW97MIE8UV0xot3NwSxzVSDwgIzh12CjP/Nwl9qGtqKTORfi gg9QiiXcwy93Q83q+4DwkEp6c3kc2LIQOHESTYdMb54ChaZG3xAeAFMm7H+kvA8rqn4v 4X8CumbNZxYrkFI2FHM2V0hl3ClByUFG4mbfYRuSThd9yvZIqa2oQClH06g5m491utFz KbVok38KqyN/jPxk6O04xACXPcNYr1u6BevC36yWo55G9W6NhtuL3Rxv/aC5Jmk7Wr3z 85AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=d00MKPi2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id q6-20020a170902bd8600b001d34dd65eeasi1033379pls.528.2023.12.13.02.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 02:39:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=d00MKPi2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id ED1458061B7C; Wed, 13 Dec 2023 02:39:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233262AbjLMKjA (ORCPT + 99 others); Wed, 13 Dec 2023 05:39:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233145AbjLMKi5 (ORCPT ); Wed, 13 Dec 2023 05:38:57 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 224C699 for ; Wed, 13 Dec 2023 02:39:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702463943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7rbywSJ96wW9dFZf5YYYGCHOwBB3IiK91ZMT119qoHk=; b=d00MKPi2mfcf3Z4bQOLrphg0xk29RbdhlbR1ksqr/1jgLfJusuaFMJBLjy+H5AqmWtbj3b x8YH29vQcKuillORRHAZah3JfoMCvbWnXaDwVeouosiSeuCVTZ9QgXDi2lpzHRfI9K1KLa lfE2XVjVXv2Pi58GiVqzIq4N0JwtxQE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-315-K423LaHkPz29mNRoosG6eQ-1; Wed, 13 Dec 2023 05:39:00 -0500 X-MC-Unique: K423LaHkPz29mNRoosG6eQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A0F785CEA2; Wed, 13 Dec 2023 10:38:59 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 901B8C157C0; Wed, 13 Dec 2023 10:38:57 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 To: torvalds@linux-foundation.org cc: dhowells@redhat.com, Yusong Gao , Juerg Haefliger , jarkko@kernel.org, davem@davemloft.net, dwmw2@infradead.org, juergh@proton.me, zohar@linux.ibm.com, herbert@gondor.apana.org.au, lists@sapience.com, dimitri.ledkov@canonical.com, keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5] sign-file: Fix incorrect return values check MIME-Version: 1.0 Content-ID: <308938.1702463908.1@warthog.procyon.org.uk> From: David Howells Date: Wed, 13 Dec 2023 10:38:56 +0000 Message-ID: <308966.1702463936@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Dec 2023 02:39:09 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785162838709190555 X-GMAIL-MSGID: 1785162838709190555 Hi Linus, Could you apply this, please? David --- From: Yusong Gao sign-file: Fix incorrect return values check There are some wrong return values check in sign-file when call OpenSSL API. The ERR() check cond is wrong because of the program only check the return value is < 0 which ignored the return val is 0. For example: 1. CMS_final() return 1 for success or 0 for failure. 2. i2d_CMS_bio_stream() returns 1 for success or 0 for failure. 3. i2d_TYPEbio() return 1 for success and 0 for failure. 4. BIO_free() return 1 for success and 0 for failure. Link: https://www.openssl.org/docs/manmaster/man3/ Fixes: e5a2e3c84782 ("scripts/sign-file.c: Add support for signing with a raw signature") Signed-off-by: Yusong Gao Reviewed-by: Juerg Haefliger Signed-off-by: David Howells Link: https://lore.kernel.org/r/20231213024405.624692-1-a869920004@gmail.com/ # v5 --- scripts/sign-file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/sign-file.c b/scripts/sign-file.c index 598ef5465f82..3edb156ae52c 100644 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -322,7 +322,7 @@ int main(int argc, char **argv) CMS_NOSMIMECAP | use_keyid | use_signed_attrs), "CMS_add1_signer"); - ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0, + ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) != 1, "CMS_final"); #else @@ -341,10 +341,10 @@ int main(int argc, char **argv) b = BIO_new_file(sig_file_name, "wb"); ERR(!b, "%s", sig_file_name); #ifndef USE_PKCS7 - ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0, + ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) != 1, "%s", sig_file_name); #else - ERR(i2d_PKCS7_bio(b, pkcs7) < 0, + ERR(i2d_PKCS7_bio(b, pkcs7) != 1, "%s", sig_file_name); #endif BIO_free(b); @@ -374,9 +374,9 @@ int main(int argc, char **argv) if (!raw_sig) { #ifndef USE_PKCS7 - ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) < 0, "%s", dest_name); + ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) != 1, "%s", dest_name); #else - ERR(i2d_PKCS7_bio(bd, pkcs7) < 0, "%s", dest_name); + ERR(i2d_PKCS7_bio(bd, pkcs7) != 1, "%s", dest_name); #endif } else { BIO *b; @@ -396,7 +396,7 @@ int main(int argc, char **argv) ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, "%s", dest_name); ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0, "%s", dest_name); - ERR(BIO_free(bd) < 0, "%s", dest_name); + ERR(BIO_free(bd) != 1, "%s", dest_name); /* Finally, if we're signing in place, replace the original. */ if (replace_orig)