From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 520ACC433FF for ; Mon, 5 Aug 2019 20:30:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3131E2173C for ; Mon, 5 Aug 2019 20:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730147AbfHEUaR (ORCPT ); Mon, 5 Aug 2019 16:30:17 -0400 Received: from mga05.intel.com ([192.55.52.43]:37312 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727802AbfHEUaR (ORCPT ); Mon, 5 Aug 2019 16:30:17 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Aug 2019 13:30:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,350,1559545200"; d="scan'208";a="198086880" Received: from alison-desk.jf.intel.com ([10.54.74.53]) by fmsmga004.fm.intel.com with ESMTP; 05 Aug 2019 13:30:15 -0700 Date: Mon, 5 Aug 2019 13:31:02 -0700 From: Alison Schofield To: Ben Boeckel Cc: "Kirill A. Shutemov" , Andrew Morton , x86@kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Peter Zijlstra , Andy Lutomirski , David Howells , Kees Cook , Dave Hansen , Kai Huang , Jacob Pan , linux-mm@kvack.org, kvm@vger.kernel.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A . Shutemov" Subject: Re: [PATCHv2 25/59] keys/mktme: Preparse the MKTME key payload Message-ID: <20190805203102.GA7592@alison-desk.jf.intel.com> References: <20190731150813.26289-1-kirill.shutemov@linux.intel.com> <20190731150813.26289-26-kirill.shutemov@linux.intel.com> <20190805115819.GA31656@rotor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190805115819.GA31656@rotor> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, Aug 05, 2019 at 07:58:19AM -0400, Ben Boeckel wrote: > On Wed, Jul 31, 2019 at 18:07:39 +0300, Kirill A. Shutemov wrote: > > From: Alison Schofield > > +/* Make sure arguments are correct for the TYPE of key requested */ > > +static int mktme_check_options(u32 *payload, unsigned long token_mask, > > + enum mktme_type type, enum mktme_alg alg) > > +{ > > + if (!token_mask) > > + return -EINVAL; > > + > > + switch (type) { > > + case MKTME_TYPE_CPU: > > + if (test_bit(OPT_ALGORITHM, &token_mask)) > > + *payload |= (1 << alg) << 8; > > + else > > + return -EINVAL; > > + > > + *payload |= MKTME_KEYID_SET_KEY_RANDOM; > > + break; > > + > > + case MKTME_TYPE_NO_ENCRYPT: if (test_bit(OPT_ALGORITHM, &token_mask)) return -EINVAL; > > + *payload |= MKTME_KEYID_NO_ENCRYPT; > > + break; > > The documentation states that for `type=no-encrypt`, algorithm must not > be specified at all. Where is that checked? > > --Ben It's not currently checked, but should be. I'll add it as shown above. Thanks for the review, Alison