From patchwork Thu Jul 21 23:31:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 9242655 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 6D5E1602F0 for ; Thu, 21 Jul 2016 23:31:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60D9F20120 for ; Thu, 21 Jul 2016 23:31:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55A2B20453; Thu, 21 Jul 2016 23:31:46 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham 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 0E1D526246 for ; Thu, 21 Jul 2016 23:31:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752618AbcGUXbo (ORCPT ); Thu, 21 Jul 2016 19:31:44 -0400 Received: from mga09.intel.com ([134.134.136.24]:49459 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752626AbcGUXbn (ORCPT ); Thu, 21 Jul 2016 19:31:43 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 21 Jul 2016 16:31:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,401,1464678000"; d="scan'208";a="737985684" Received: from mjmartin-nuc01.wa.intel.com ([10.232.97.131]) by FMSMGA003.fm.intel.com with ESMTP; 21 Jul 2016 16:31:40 -0700 From: Mat Martineau To: keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, dhowells@redhat.com Cc: Mat Martineau , zohar@linux.vnet.ibm.com, marcel@holtmann.org Subject: [PATCH v6 2/6] KEYS: Add a key pointer for use by restrict functions Date: Thu, 21 Jul 2016 16:31:35 -0700 Message-Id: <20160721233139.4085-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160721233139.4085-1-mathew.j.martineau@linux.intel.com> References: <20160721233139.4085-1-mathew.j.martineau@linux.intel.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Some restrict functions need to reference an existing key or keyring in order to evaluate a key being linked to a keyring. The restrict_key member of struct key (when it represents a keyring) points to the existing key(s) to use when linking to a restricted keyring. Signed-off-by: Mat Martineau --- include/linux/key.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/key.h b/include/linux/key.h index df05059..8556e13 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -204,6 +204,7 @@ struct key { /* Keyring bits */ struct list_head name_link; struct assoc_array keys; + struct key *restrict_key; }; int reject_error; };