Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Dave Kleikamp <dave.kleikamp@oracle.com>
To:     linux-kernel@vger.kernel.org
Cc:     Sumit Garg <sumit.garg@linaro.org>,
        James Bottomley <jejb@linux.ibm.com>,
        Jarkko Sakkinen <jarkko@kernel.org>,
        Mimi Zohar <zohar@linux.ibm.com>,
        David Howells <dhowells@redhat.com>,
        James Morris <jmorris@namei.org>,
        "Serge E. Hallyn" <serge@hallyn.com>,
        linux-integrity@vger.kernel.org, keyrings@vger.kernel.org,
        linux-security-module@vger.kernel.org
Subject: [PATCH v2] KEYS: trusted: Avoid calling null function trusted_key_exit
Date:   Wed, 26 Jan 2022 14:32:43 -0600
Message-Id: <20220126203243.231822-1-dave.kleikamp@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MKDaoGeSppVV0fYAxsaZev9sOIhUilvr2h0LOQnJx9v966m+vaB8VOB1C+N7?=
 =?us-ascii?Q?rOB5wQqOpxSn9y9e8mCXVn0pL5nENCF8VnaJrBmdC6utcwSWIW1vR/UuLkyS?=
 =?us-ascii?Q?XaopfbDValVvbWG2DArgiqj381pST3G30VvNq/sNJcxJP7ykrg/6T78E5voS?=
 =?us-ascii?Q?8aOEj6W1b76ZWl5KENM0SNKFB2DvQluYLhuwc9/N0AkNpIHzq1dDjW6Darst?=
 =?us-ascii?Q?NBAn4Cp3/RJpSdyhtQQK1LRxBLgu+vDipi/iSFa7nqD1B7kOl3FExrKl+buB?=
 =?us-ascii?Q?u9hbHTw025FwwL+Rd3KJkTTcNuWDnNUp2JZFnuMIkk6TjTWFljCnsa3AmTqo?=
 =?us-ascii?Q?5jHqxBMcbNPvDAj7YsH84f55bW+Brq65U3fJ5Q5tnNcFsIrZfGkwHxqhRVUy?=
 =?us-ascii?Q?oq7LJSJmvOCmRgP8/jDtPKnZCPfg+O9iZXOZRxSRL86UGgvqlmb7S2XbVtcu?=
 =?us-ascii?Q?y+e0rI0ZoIVqfeA3MeHe/x9Cj6jESWgqOhLZ+ulNRUOTMQs8meh5xrBl3oQu?=
 =?us-ascii?Q?5DowsOqLaGE4dh+Vi+a6WxM/vWpomKPHziEHg3s05AOpXlPquGrBvBgkE2HV?=
 =?us-ascii?Q?lxkgse7peNDmfMCKpH7oyoQy/5IxNDprPBELjBt0zw3VBAfZ2EnkSKxWsC14?=
 =?us-ascii?Q?yiLsnfx6sXaWFr2/MUzpA3OYgGbKpVz+LsN9v9n/zvDwyKRLeJuB/ZKPhlt8?=
 =?us-ascii?Q?IRxcoqTcizJlkjYYGVXs0pRSZ/9ZNADl0X1m4zHhHx1JJ7Bkvga78C4a1zJs?=
 =?us-ascii?Q?JTF4Axt+IR5dUSyjWT14CD4WsotSj/lBWvDhS19inISwPGGRy/OJ2EbIlhca?=
 =?us-ascii?Q?1X8ENwXKoWz35nr9x10ENIruqjVOSK4l0iWTMeK5KZb16Zmp2slSMdaucbJw?=
 =?us-ascii?Q?FQ3X1p9+sG1HAjf1KLMLeWLQ8P++9+2RGl3H6x2ltPf4OXmBBBI3YxcwMbuB?=
 =?us-ascii?Q?R8qeargNL0i2jK770zbQ0+xynXBa6UPjTWPiSKkEdi1173IxHM297CY+Z0jh?=
 =?us-ascii?Q?Hb9ZxxfxLwRPz//g1KhhreoTJ0RsKLwd6xcP5nwXdOhPjZrXgyflmhBjps/K?=
 =?us-ascii?Q?tsf9Gl4o/q6O+ieUh3rPhH3S3l1CKdpDNivD3Vm8Tp/u3sfVl5Y65MBACBdP?=
 =?us-ascii?Q?jYsv0otMafwUF7M1L4FwIKMOqluahUchB4zip7dypbURqjuzNWs9wCV9dFeB?=
 =?us-ascii?Q?jTSMtSn8Al8ByovrpIyxd3cyokphxE8s9GTve3PMfkdmZCCgmMszSQvFnR8o?=
 =?us-ascii?Q?Ljz0RvBhpg8PhIQyyOWIn0Makw7yn8WoZ4MZJQsJbRz8aMg8At8nuy+RaZRd?=
 =?us-ascii?Q?3At/F8kEqGOyvqaaAC89pOvVtG9LCwAzY6nJYdP7MlT0lC8K5dEd2BpGhqV7?=
 =?us-ascii?Q?btxlC4gmqBYWSE4/tzK/y4nZtO/gJR9PS1Xzem+ADXIXmRAB0j8t0l9DMOgk?=
 =?us-ascii?Q?Rr9xqOdTGerSnk+/hCRp6DCvopJXjX3HXA9X1fFn6867bVGlKO7av8aoHowG?=
 =?us-ascii?Q?vD7iB+1YEndMFi0Zply92JGiAavmsFT0zS0a5Xnuiysmm58HMghHRd/cTFjk?=
 =?us-ascii?Q?srFS3308lAocu0DHeAc5+7uSR0nWM0LwnS8M9EEVMbIhrEIE1tOTKpbd9/Pu?=
 =?us-ascii?Q?BogY406v2QD+urTQuZ/kFvalwsUGn3+vK1BZnVkHVg2IngLoYTL8VTM22b6E?=
 =?us-ascii?Q?bxISIQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1d370849-b5a9-4667-a4ad-08d9e10b0589
X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4665.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2022 20:32:50.5475
 (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: fuOaf7+X0ukQN+8+2vSk4cnbfxV2B329D1tud0OanCkr3zTAbvckXeDJt8nPvuAudUWHms9/wG62sfOKHe+3riBOfdYzTgjim1c94Fy6BAU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5650
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10239 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 mlxscore=0
 phishscore=0 suspectscore=0 spamscore=0 mlxlogscore=999 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2201260119
X-Proofpoint-GUID: MCg0VEQHAzBED6zxUemeFzRO5zXMq44n
X-Proofpoint-ORIG-GUID: MCg0VEQHAzBED6zxUemeFzRO5zXMq44n
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If one loads and unloads the trusted module, trusted_key_exit can be
NULL. Call it through static_call_cond() to avoid a kernel trap.

Fixes: 5d0682be3189 ("KEYS: trusted: Add generic trusted keys framework")
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Sumit Garg <sumit.garg@linaro.org>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Cc: Mimi Zohar <zohar@linux.ibm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: linux-integrity@vger.kernel.org
Cc: keyrings@vger.kernel.org
Cc: linux-security-module@vger.kernel.org
---
v2 changes:
Header cleanup - removed empty line and cc:stable
 security/keys/trusted-keys/trusted_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
index d5c891d8d353..8c14e04e2112 100644
--- a/security/keys/trusted-keys/trusted_core.c
+++ b/security/keys/trusted-keys/trusted_core.c
@@ -351,7 +351,7 @@ static int __init init_trusted(void)
 
 static void __exit cleanup_trusted(void)
 {
-	static_call(trusted_key_exit)();
+	static_call_cond(trusted_key_exit)();
 }
 
 late_initcall(init_trusted);
-- 
2.35.0