Received: by 10.223.185.116 with SMTP id b49csp4184478wrg; Mon, 26 Feb 2018 12:45:45 -0800 (PST) X-Google-Smtp-Source: AH8x224GURrb7OjQbZM8x+R+KsQrbcybgMHwOCKaupLsKQKkstqWyewkvXJ5GOj045R6qPtDvDac X-Received: by 2002:a17:902:e83:: with SMTP id 3-v6mr11768201plx.158.1519677945805; Mon, 26 Feb 2018 12:45:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677945; cv=none; d=google.com; s=arc-20160816; b=sTstK276kaAmsHn0aECMI2iwDz6jOBaRfUqeClKjnfDYipUbIuMSAMEt7t79N/Kiw7 qZX6R2NzIhY7THp+ZbOn/jlLzp9S71wr05su8zxKiRySviZBr8spADloarcdAqkJhUQz mitU4RVHrvhn3RC5WNq07lsoYKy3zdbOFihaWuxivWMuLpYyPDJo6UEkENefTOtPtBiR LpCr988HC8oq13oL4/yEL/Ln72OCaJLvzA08kaha2XmqoT3fDX3m6+bwVIDqVT6sCO0p Z0+7IPf7IDv5tz7Ik4S5IEfzjtebm3HrfzCk08NWj+l/iq1JrjHYqxLzXXaLK0dtV3c3 WTaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=L0OB0r0tVeKqHh10X9k55+ODIoWYG3i73d/55MR/QgE=; b=dSFr0RppqBji5H7Wd96u46MgyVopTGwE+bTdNnH3fF75rQvgNNIkF5CV901O3Ehobb 5ebONQjMyCCRNx4qwsbKqvz6xsC9I1bHPU5E0WtcBJfA1X5+acW77vmncnPlfdT8Mu6a 0AR4NGr3tX6ptg5V2PnYSE3NcVugvmef9ZMUTQYFS0evDgg6GO8Awk2GoUDKSvRG5nU8 24q8Gyyg3CDvfBnoRfzXxGNFq4QMfprEC07uZphZx3msmyszHACf748SznVJMKEkuq7a 78tKbbLsLnv58+GfGT/GnmWuCZM0oYR4ngxge9uZDBMNGfGufL4O49aCtPRSFDUcsszU w7Rg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k15si5958420pgc.482.2018.02.26.12.45.29; Mon, 26 Feb 2018 12:45:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752660AbeBZUoS (ORCPT + 99 others); Mon, 26 Feb 2018 15:44:18 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:35698 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752686AbeBZU0V (ORCPT ); Mon, 26 Feb 2018 15:26:21 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 2BCEFFFC; Mon, 26 Feb 2018 20:26:19 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Biggers , David Howells Subject: [PATCH 4.15 14/64] PKCS#7: fix certificate blacklisting Date: Mon, 26 Feb 2018 21:21:51 +0100 Message-Id: <20180226202154.051131818@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Biggers commit 29f4a67c17e19314b7d74b8569be935e6c7edf50 upstream. If there is a blacklisted certificate in a SignerInfo's certificate chain, then pkcs7_verify_sig_chain() sets sinfo->blacklisted and returns 0. But, pkcs7_verify() fails to handle this case appropriately, as it actually continues on to the line 'actual_ret = 0;', indicating that the SignerInfo has passed verification. Consequently, PKCS#7 signature verification ignores the certificate blacklist. Fix this by not considering blacklisted SignerInfos to have passed verification. Also fix the function comment with regards to when 0 is returned. Fixes: 03bb79315ddc ("PKCS#7: Handle blacklisted certificates") Cc: # v4.12+ Signed-off-by: Eric Biggers Signed-off-by: David Howells Signed-off-by: Greg Kroah-Hartman --- crypto/asymmetric_keys/pkcs7_verify.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/crypto/asymmetric_keys/pkcs7_verify.c +++ b/crypto/asymmetric_keys/pkcs7_verify.c @@ -366,8 +366,7 @@ static int pkcs7_verify_one(struct pkcs7 * * (*) -EBADMSG if some part of the message was invalid, or: * - * (*) 0 if no signature chains were found to be blacklisted or to contain - * unsupported crypto, or: + * (*) 0 if a signature chain passed verification, or: * * (*) -EKEYREJECTED if a blacklisted key was encountered, or: * @@ -423,8 +422,11 @@ int pkcs7_verify(struct pkcs7_message *p for (sinfo = pkcs7->signed_infos; sinfo; sinfo = sinfo->next) { ret = pkcs7_verify_one(pkcs7, sinfo); - if (sinfo->blacklisted && actual_ret == -ENOPKG) - actual_ret = -EKEYREJECTED; + if (sinfo->blacklisted) { + if (actual_ret == -ENOPKG) + actual_ret = -EKEYREJECTED; + continue; + } if (ret < 0) { if (ret == -ENOPKG) { sinfo->unsupported_crypto = true;