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, stable@vger.kernel.org
Subject: [PATCH] KEYS: trusted: Avoid calling null function trusted_key_exit
Date:   Wed, 26 Jan 2022 12:41:55 -0600
Message-Id: <20220126184155.220814-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?5PKAGwIpnDARXfEu/yS14R87vJnC5jI3Info2Gp+EMJ9XR9I5uqm5jPioKOj?=
 =?us-ascii?Q?NOArOtuVkxfp66ii+T4bq6iDUj2jh676oAx3d4O5dAQJmUwnTfTcbsHpQ07s?=
 =?us-ascii?Q?JCIEdPobnpdCEtpCUX4SMegJb7WWmkuG/8OqjJ5R/q7dNsJWmPNn6MFDzcbZ?=
 =?us-ascii?Q?JRw8J16t6P0CPFZYLG5o5IwhZ23rKgTrAkBW2eYheY1JXGu6n7zEHn2mzjmI?=
 =?us-ascii?Q?7vB0IZvEYoVKylTtsUy951ZvFRgO91APf02flcEbieX5JCh+qC6DmeE2Hk9y?=
 =?us-ascii?Q?nv9sWxs8jAOUX+yIH6x7TbNI4swoZOHDYLWm/PoeHqf5bVLPw4h/LhpYzeDk?=
 =?us-ascii?Q?wV+qoBygipFaSl5O37tbUumfp9CSndFMsafHBcL86iQZwpnBBSnhEF4ov9EV?=
 =?us-ascii?Q?cJeYjYfkXg/OLKocTVhfNrnIOGwdiYQD5FKgmS4DE7Lqi76IzTbJiHB4ljpb?=
 =?us-ascii?Q?28ft4D+nzt8pnfeCvq8rIjmT7Trqf2NKAJPKpElJ4MRyrkwBZcgFAcviCDky?=
 =?us-ascii?Q?s2hwTBGf0zWJpE3kUAzurNGu0IyqcRQaZw+hNQ9kdJ3eDrdOOA2JSp0U7kiJ?=
 =?us-ascii?Q?qzArz5Hb53Wev9FMPCSfk55UoFUyk7pPxeVx2NnWV4mBub4WcWLRnBTymBWx?=
 =?us-ascii?Q?XWeTt5/mxCLwkKiLQ1mxew49JSJMIKFv/SIksnDPISNntO3+8R0Tlzd75MbQ?=
 =?us-ascii?Q?rQZozk/NCx1+GsxnMoDywMmosBl9xVfcNYj4N/RZCf7A5iDtwS9sXXpzwcDb?=
 =?us-ascii?Q?E8YTh26Tmed4+uiFcqu0HWcezA+0BErN2y2+mlyI0pQqCWwFuc0/2pnTkmuS?=
 =?us-ascii?Q?+9eFGY+pNUUbSoCcmMxrEmO4MCyxQGjwPbC+jYuU2+aCfrmJCwciMwq/YR/G?=
 =?us-ascii?Q?qLreF2bYYNt/fQykkVdPwatI/FwoGoZmGsrm1gF1ZZRuNsI9u5WHeX0pxvhj?=
 =?us-ascii?Q?TcOndnXPu4l4IMUnoy4Ohu5A9Y7dj6jyXJgUefmERr+9t+AspzTH0rW+4IDY?=
 =?us-ascii?Q?f9myaV8LWz8DzPW98N1TRG6YlrGeAoW3xSoXzthQuEQaT3kK+PX5gQP8PZZR?=
 =?us-ascii?Q?y22zSnWoBbowt8pSh4nuR9keQ6X8MrofgLRTBwxwdqEbalMSdAoZgf8/zV75?=
 =?us-ascii?Q?HZEPxN2/C5o6a2vVvFrWeIzKnATlsSo+kMz0NjfN+AWqb6oWAtcrxlZTqJUg?=
 =?us-ascii?Q?4eOg/roQxfAmiYt2PoBgduuhLEvW+rundSNcDVndsRyfDuwVUzxXFeVwlbmP?=
 =?us-ascii?Q?hL0HjRStudca5Z+NqhiXJ6S1OYNioX/81rPmBuEs4ikxIV0ZvSKY3UnTs2ef?=
 =?us-ascii?Q?4dLo8+WIqRlHFMG+A0B2JOSeRWiacNW2CZNQBtpbAof5cb6ekuZ1KWq7VBdl?=
 =?us-ascii?Q?KR5Lw400oG3tmKfk69fIPrB8hd+fqziOXyAqe48TyJF5k428HLYTKlJekJbR?=
 =?us-ascii?Q?V2o2nd5YyuZXPAypmv+EpHiCGE3jypY1wLzQbybmDvnnOUjwgU8BfXeC4rXK?=
 =?us-ascii?Q?DHYJo1pyxLpo4AVn3ldq1JlXeHqBEJzstA/c3ecQF7KanHBazt1ptRUtX6JX?=
 =?us-ascii?Q?AXmOU2LNkyj5jNqRiO8p/cswWYdfvH1PMq24S7I78RGa4wngbjyE0llJ76qZ?=
 =?us-ascii?Q?XgC9NOXXlDPNXEUPWHDfO0fisrDcEUyuN4YUpwD5HRlSP8cShgHsTb3RewZ6?=
 =?us-ascii?Q?ifFltw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b650bedb-73ab-41dc-78ae-08d9e0fb8b0c
X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4665.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2022 18:42:02.7335
 (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: YubJ6jnMD/0ihNjUadwlhxGT+2Pm8g5MybF151RBbgqCZJFU09lyqxTqFhj/7t9DlroM6FXUGjzCBx4/LG2O/JpU6JQ6zASym56FJFmWUbA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR10MB1474
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-2201260112
X-Proofpoint-ORIG-GUID: low1Ae3vaR5lbdRn8mQ-CuySEK2zgA8l
X-Proofpoint-GUID: low1Ae3vaR5lbdRn8mQ-CuySEK2zgA8l
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
Cc: stable@vger.kernel.org
---
 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