From: Marco Elver Date: Mon, 19 Jan 2026 09:05:54 +0000 (+0100) Subject: crypto: Use scoped init guard X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39261f55b3ee58d85e96142763c25b945399b2f;p=thirdparty%2Fkernel%2Flinux.git crypto: Use scoped init guard Convert lock initialization to scoped guarded initialization where lock-guarded members are initialized in the same scope. This ensures the context analysis treats the context as active during member initialization. This is required to avoid errors once implicit context assertion is removed. Signed-off-by: Marco Elver Signed-off-by: Peter Zijlstra (Intel) Link: https://patch.msgid.link/20260119094029.1344361-5-elver@google.com --- diff --git a/crypto/crypto_engine.c b/crypto/crypto_engine.c index 1653a4bf5b317..afb6848f7df4c 100644 --- a/crypto/crypto_engine.c +++ b/crypto/crypto_engine.c @@ -453,7 +453,7 @@ struct crypto_engine *crypto_engine_alloc_init_and_set(struct device *dev, snprintf(engine->name, sizeof(engine->name), "%s-engine", dev_name(dev)); - spin_lock_init(&engine->queue_lock); + guard(spinlock_init)(&engine->queue_lock); crypto_init_queue(&engine->queue, qlen); engine->kworker = kthread_run_worker(0, "%s", engine->name); diff --git a/crypto/drbg.c b/crypto/drbg.c index 0a6f6c05a78fe..21b339c76cca3 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1780,7 +1780,7 @@ static inline int __init drbg_healthcheck_sanity(void) if (!drbg) return -ENOMEM; - mutex_init(&drbg->drbg_mutex); + guard(mutex_init)(&drbg->drbg_mutex); drbg->core = &drbg_cores[coreref]; drbg->reseed_threshold = drbg_max_requests(drbg);