Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp497679pxj; Fri, 14 May 2021 08:30:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXXx/2duxSflrOv3eY85OOCwPlXejRVpeGKvBRz2BzWtfYS7hYZu/+00BJZDb+hOcI8EWp X-Received: by 2002:a05:6638:388e:: with SMTP id b14mr7331986jav.73.1621006215115; Fri, 14 May 2021 08:30:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621006215; cv=none; d=google.com; s=arc-20160816; b=qY+q0DgLURH8uOXCv8Yrudk7FC21q5zafewi1uWRXK4L7k+7er9ER7v/uR1U0csHFk ssN7K8bYqQB8ur8tzHhRiNDh67RbEp4F8t6ooKSOlD+7hH4cmlifrby9AaX03dA8Jpxx nhXVKpiCVxg5YOMv2NZGXhtL7nEcsIsUdTPwY6MARE53fksp1838Jo4aqkG7NJ4OjzO+ DJpqy6erxhlNJsjrP8u53rDlSjCuBO9E+4nB+dbP5Wn1mUUl/4/Sav4tOYc1DkkqXl92 Ev2+KIa2JfOywv8etVXFLfcQYPyFdvTiXEFimw3C3BDzevHd8MNZWNRirqxcW8gYJRNk Y4Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=H/1p8p/JtBXTWPOjD+rW08HNLbgKAJ0Ug+XsZ6kwjFM=; b=F/GQSRZ9b8uRROxyYlPPpVDqubVOV1lLk0CNi+oztL0v3a/TzUFf1F6gO3xhcnp4m0 P4/ryfnf0mmGZSJD39e4bq4DXocDVdAklb+7dYmhbU2II4YFlB93A/nYxCTFRB9qItt4 LGF3hDf73/RXLf3Nwxu1F1lFjGiLHuzX45JV7i+ly7xfSAB39Np+qeiIH6KpDb6Wp/nz SOCK72sggqB8ebjHxFgYzpdhAasnQHpITFIe65dRMHvCCQU5h97NJ1bKa3ACo1YbNewq JaDpQotc3fZznM/9SOwo8XAuNLQ7HaS/wLz9aWj+kMEK01r49By4RusiKS9q962qUuBy RMYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w13si7726516ioj.33.2021.05.14.08.30.02; Fri, 14 May 2021 08:30:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233840AbhENJec (ORCPT + 99 others); Fri, 14 May 2021 05:34:32 -0400 Received: from out30-130.freemail.mail.aliyun.com ([115.124.30.130]:35473 "EHLO out30-130.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230440AbhENJeb (ORCPT ); Fri, 14 May 2021 05:34:31 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R971e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04420;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0UYqUvyl_1620984798; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0UYqUvyl_1620984798) by smtp.aliyun-inc.com(127.0.0.1); Fri, 14 May 2021 17:33:18 +0800 From: Tianjia Zhang To: David Howells , David Woodhouse , keyrings@vger.kernel.org, linux-kernel@vger.kernel.org, Jia Zhang Cc: Tianjia Zhang Subject: [PATCH] sign-file: Fix confusing error messages Date: Fri, 14 May 2021 17:33:18 +0800 Message-Id: <20210514093318.85887-1-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.3.ge56e4f7 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When an error occurs, use errx() instead of err() to display the error message, because openssl has its own error record. When an error occurs, errno will not be changed, while err() displays the errno error message. It will cause confusion. For example, when CMS_add1_signer() fails, the following message will appear: sign-file: CMS_add1_signer: Success errx() ignores errno and does not cause such issue. Signed-off-by: Tianjia Zhang --- scripts/sign-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sign-file.c b/scripts/sign-file.c index fbd34b8e8f57..37d8760cb0d1 100644 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -107,7 +107,7 @@ static void drain_openssl_errors(void) bool __cond = (cond); \ display_openssl_errors(__LINE__); \ if (__cond) { \ - err(1, fmt, ## __VA_ARGS__); \ + errx(1, fmt, ## __VA_ARGS__); \ } \ } while(0) -- 2.19.1.3.ge56e4f7