From:   Eric Snowberg <eric.snowberg@oracle.com>
To:     keyrings@vger.kernel.org, linux-integrity@vger.kernel.org,
        zohar@linux.ibm.com, dhowells@redhat.com, dwmw2@infradead.org,
        herbert@gondor.apana.org.au, davem@davemloft.net,
        jarkko@kernel.org, jmorris@namei.org, serge@hallyn.com
Cc:     eric.snowberg@oracle.com, keescook@chromium.org,
        torvalds@linux-foundation.org, weiyongjun1@huawei.com,
        nayna@linux.ibm.com, ebiggers@google.com, ardb@kernel.org,
        nramas@linux.microsoft.com, lszubowi@redhat.com, jason@zx2c4.com,
        linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org,
        linux-efi@vger.kernel.org, linux-security-module@vger.kernel.org,
        James.Bottomley@HansenPartnership.com, pjones@redhat.com,
        konrad.wilk@oracle.com
Subject: [PATCH v8 09/17] KEYS: Rename get_builtin_and_secondary_restriction
Date:   Tue, 23 Nov 2021 23:41:16 -0500
Message-Id: <20211124044124.998170-10-eric.snowberg@oracle.com>
In-Reply-To: <20211124044124.998170-1-eric.snowberg@oracle.com>
References: <20211124044124.998170-1-eric.snowberg@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6yIPQHfJ+5F98dpFm0nYDCRc47DupPSEFBUpCww5nJZzGWnkFvKBsgumtb3U?=
 =?us-ascii?Q?0ksd/aVfkWNjkkhIQ+L9zYI19F1UbNE2miSUhbQ/tCpcYzkjOAu0RTCr1LjV?=
 =?us-ascii?Q?tBiandRne+hYjBGYO/WXo7fu7n2r5H1Ups3quayBcYnM0MGQNrLGcN7njPNb?=
 =?us-ascii?Q?HZ2VYLWn4B80bcqDSJMHCjwXOMJe4nrd9Yt4tFoRZoQC3royaP1+l3S65ivR?=
 =?us-ascii?Q?4zC9R86i7yt5KpEICsCws0a86T6ihHR4W1bGG6mC4ivqmJuQrhZ7KFhqS5wt?=
 =?us-ascii?Q?vJ7n/z6b2csMMJAHfHwvrrW28iMDOV257HnwlF9KtR11qoCvc8Rsx44Vwez+?=
 =?us-ascii?Q?XcYYl8d9NsxMPz0jp/odKtKrUn8BvCfKaz6AWa6aw3zdM/5lmbMrAtmrEg4l?=
 =?us-ascii?Q?13nOzpjJUTXUAeM+ZRdGkNJ1o2GnvQ87pNvS+1VNYAdVdfq6/ttidc8VhudP?=
 =?us-ascii?Q?MPlqO+usOsRC/yv/7fAAwE0BiHX8pTdzygRAIpfXlyaNalJ6iCB1tWe7WKjd?=
 =?us-ascii?Q?NPdwuOyyavdWiE+ikPDb51PYuSANwbfHsO2VNQ+aJu5uNNjgXB+V54g9ZOFw?=
 =?us-ascii?Q?I4k7jMAXvcOGPGmkbdKJYuXo4tjfX7rQhLdEiek8CWcwEZ+7iRuKxK99zmZM?=
 =?us-ascii?Q?Xnhaw5Qk07Rg40tVMyRp2DqLWzY9l0grpagSrsLDno0hQCwsF81ZbtQWtOMm?=
 =?us-ascii?Q?7D4jZC3MbhkexR/RX5HfGQFqTXHUEJgqf274lTDzAloTifDGpuzFLJkLCDnM?=
 =?us-ascii?Q?dPeYECurCbYsRdo9+YRE3X2qyXjY5yfvJTi2RfQoHoYvC75WFsnLTPemSp1r?=
 =?us-ascii?Q?sW+C7oT/+oaz7+VzhJtD4MZsRbwW+PMU+0GL8hhz5dPa17E70eNsF3WbOkMt?=
 =?us-ascii?Q?shzh9xiwk8HRHiGYMwAh0mTylBc/XMGh83MUDpASPwSY/HKyQ3CVk+scKbNc?=
 =?us-ascii?Q?93BQqVDZEfBFC/aQBbP1SDuaGr5URwZf9CnTh5ML2kXYxUcN2BI0+cv5Hs7y?=
 =?us-ascii?Q?UnSitfZYc3FOFexvFK5zpMc0hKm3JE18xrcCa04utnq1YcFKRx4PdcFZbxWB?=
 =?us-ascii?Q?v9uh+ge9CjCqGQyMcni+GfHBzxflDOAMy0DjrVKaU1J/LKv8UIKxQqzWZM7N?=
 =?us-ascii?Q?O0hALvfP3OlZrKrOYvxXQXIzWT2wsm0PgDiFUWvTBYu+oHJmBGcLIzgQFy/t?=
 =?us-ascii?Q?oqOidR2Lsw+eLiH31yx9Gm7VtISax+O/pGrwJCcGFs6FLNFkO0q8fOXIY/6i?=
 =?us-ascii?Q?9H73RYRkyTzuCa+dBLr2dDHJSoFnZ0VA4tlgU4IAurO90FrEprkL80UgqarO?=
 =?us-ascii?Q?1CU09oBWcd6uaWVnu/1dj49lLDuy5G1b2kr8oPq6zbmeT+VtbwUZw541pNWD?=
 =?us-ascii?Q?D/P1wuZ0LBlQRKhWWMO4NkZpZIPiiUvzLteORtoIQDERpy0N7XV3TVoJhbJn?=
 =?us-ascii?Q?PEHwHLjP8OlbxD9dYkNAmS1f7dtWVpXzkxSqdO/GtsW1PzYMhJASaEjWhqmu?=
 =?us-ascii?Q?LfKbqFTurYQjOUg0CWGWXzkvo7uRdkZ4VL4O2c1Q0CJuZh6kPRcaAyAGfaoS?=
 =?us-ascii?Q?e4ma24y4NlqZDstc1r7bNc1wL1Sk4lWwPLfRIfYEYoZrGlADD/JMU49K9O0e?=
 =?us-ascii?Q?289SY3GK5GPMXSrB/voKNFTsIcwWVDK5ZqR88CLM/PDnHVCeOSEgkWRF0no+?=
 =?us-ascii?Q?JxVNoQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8c5634b3-c97f-4614-4fdc-08d9af04cc03
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4150.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2021 04:42:18.8857
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: e4QXtEfX+9GjwEYxhnLENSVWTMjZ0cE/aRVXgspyc0diGwhuqgCGIUJX5fs+F4DcxTSibfYQIFtQ+I6NcutkTs5uz1UL+b8PWwOTHqFHeYQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB3957
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10177 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 malwarescore=0
 mlxlogscore=999 bulkscore=0 mlxscore=0 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2111240026
X-Proofpoint-GUID: dFrCczW406bMiQDONS-AWpvgFTjvNlWn
X-Proofpoint-ORIG-GUID: dFrCczW406bMiQDONS-AWpvgFTjvNlWn
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

In preparation for returning either the existing
restrict_link_by_builtin_and_secondary_trusted or the upcoming
restriction that includes the trusted builtin, secondary and
machine keys, to improve clarity, rename
get_builtin_and_secondary_restriction to get_secondary_restriction.

Suggested-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
---
v6: Initial version
v7: Unmodified from v7
v8: Code unmodified from v7, added Mimi's Reviewed-by
---
 certs/system_keyring.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/certs/system_keyring.c b/certs/system_keyring.c
index 692365dee2bd..8f1f87579819 100644
--- a/certs/system_keyring.c
+++ b/certs/system_keyring.c
@@ -77,7 +77,7 @@ int restrict_link_by_builtin_and_secondary_trusted(
  * Allocate a struct key_restriction for the "builtin and secondary trust"
  * keyring. Only for use in system_trusted_keyring_init().
  */
-static __init struct key_restriction *get_builtin_and_secondary_restriction(void)
+static __init struct key_restriction *get_secondary_restriction(void)
 {
 	struct key_restriction *restriction;
 
@@ -117,7 +117,7 @@ static __init int system_trusted_keyring_init(void)
 			       KEY_USR_VIEW | KEY_USR_READ | KEY_USR_SEARCH |
 			       KEY_USR_WRITE),
 			      KEY_ALLOC_NOT_IN_QUOTA,
-			      get_builtin_and_secondary_restriction(),
+			      get_secondary_restriction(),
 			      NULL);
 	if (IS_ERR(secondary_trusted_keys))
 		panic("Can't allocate secondary trusted keyring\n");
-- 
2.18.4