From patchwork Wed Oct 4 11:18:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 9984259 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 29B2160365 for ; Wed, 4 Oct 2017 11:18:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E75328A94 for ; Wed, 4 Oct 2017 11:18:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 133EA28ADA; Wed, 4 Oct 2017 11:18:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACEA428A94 for ; Wed, 4 Oct 2017 11:18:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751784AbdJDLSf (ORCPT ); Wed, 4 Oct 2017 07:18:35 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:52387 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474AbdJDLS3 (ORCPT ); Wed, 4 Oct 2017 07:18:29 -0400 Received: by mail-it0-f68.google.com with SMTP id c195so15163105itb.1; Wed, 04 Oct 2017 04:18:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=EMfsuqg+9IpOqMteDRLHDHNWJvisJnvR4zEdsvxSfnY=; b=MAoDxHTX280OktjsKNForR/+amwbQlhdD+CYvn/7zHDo5wpaOKVeziKCn1DD5SFyYu aquoyYH6npITtdHSJiXQsDCuCOHCJBkfIO7iGcHyD22+QBywndgyCQamdJqlFqe48KBX J3dtlSCs9AAriPuNXEpBYs2mwvYh+eap5KLaEZC+mC3jCVAaC4uUDYwKzLyvt1JHhWSw t63Ue/n4OrVDwfdyIa52b/uPJ9JjhfGih0jAv/wOudLvqUSY/0DIAU01AlP2GSW5vrMF hb470+RI5B7i+UF05t0Sh9KGrREqDt+DSlkp5IGz3d019aQ/6WFsVtXGaDdO+nzz8tOz xHhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EMfsuqg+9IpOqMteDRLHDHNWJvisJnvR4zEdsvxSfnY=; b=MmmTLkzsp5AU9uu7nY6J0wuN4mXAncuh5QUlVRwZy9Cjd7jJNpR+Tyb07vq3+ELRCt BqpBE9XlaWfeawWTPEt9AhfBOw2w45eY7qtCEkbgPeaDuznuB9oJYyuZH48Wq5xVbt58 LIZ3EeARNWsbQsGD01b4RjLByx7HK28iVmvuN4GMjnJfzy3qWoGI+cD4dz+A6cBioHQG NslX///5DWUXtyAYR/8TQo9PfAKUiAvGyA9s9Qeosa6GtV1oL7ktfIng0FatvqK2a4Kg bKH4dAc51P69GAvlh1+n8WaMwcfGidSQUhPJDGin8Fpp+ZUL+HWCHkerM1nwuCbPVaRh ESAA== X-Gm-Message-State: AMCzsaUS1XwUaBWlY+z14RwFOtGoralFBJLZnhAArUem2BJtDIdaAzAe 18xB/szqayul37sWc/sDDhA= X-Google-Smtp-Source: AOwi7QAF+02Le11E2Z01Fh7Wz+3ltEVP+Uxao4Xk3leI9CrAfjVrOHwMWWRlwiDON6DtHaQIqr1Vxw== X-Received: by 10.36.54.210 with SMTP id l201mr4443911itl.0.1507115908413; Wed, 04 Oct 2017 04:18:28 -0700 (PDT) Received: from linux-uc2j.site ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id v186sm6957704itc.3.2017.10.04.04.18.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Oct 2017 04:18:27 -0700 (PDT) From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: David Howells Cc: keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" , Herbert Xu , "David S. Miller" Subject: [PATCH] KEYS: Fix the wrong index when checking the existence of second id Date: Wed, 4 Oct 2017 19:18:22 +0800 Message-Id: <20171004111822.11141-1-jlee@suse.com> X-Mailer: git-send-email 2.10.2 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix the wrong index number when checking the existence of second id in function of finding asymmetric key. The id_1 is the second id that the index in array must be 1 but not 0. Fix: 9eb029893(KEYS: Generalise x509_request_asymmetric_key()) Cc: David Howells Cc: Herbert Xu Cc: "David S. Miller" Signed-off-by: "Lee, Chun-Yi" --- crypto/asymmetric_keys/asymmetric_type.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c index 3a3b028..39aecad 100644 --- a/crypto/asymmetric_keys/asymmetric_type.c +++ b/crypto/asymmetric_keys/asymmetric_type.c @@ -107,7 +107,7 @@ struct key *find_asymmetric_key(struct key *keyring, if (id_0 && id_1) { const struct asymmetric_key_ids *kids = asymmetric_key_ids(key); - if (!kids->id[0]) { + if (!kids->id[1]) { pr_debug("First ID matches, but second is missing\n"); goto reject; }