From nobody Tue Feb 10 02:59:38 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D2B013D638 for ; Sat, 7 Feb 2026 23:29:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770506991; cv=none; b=ojVrWBL8wTIAZtpEc/SDEtw7WDDMRUpSys1Te7B423ES4kQbvMcDCRzL5MhMyJZr1FbpJiN87agfqUrJt7SPeMFCpyUQNQbINOU44weT2QH3p57LfQv6+vKZ1Wa7H7jar/ffnvjJaFUn98d6kW3oFNVSTEyWniaALo2uISi23Jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770506991; c=relaxed/simple; bh=S5LRtN2cYZxCPFq3clmBP5tySJGGhqx6JeYNKfllNzc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=p3dk/SVYWp2PaNvb4EAnCyL1I/vaRP59tq9QwHY1srTGOiTGklZ/pEqgMiRPSRs62nwQaU4EYQlP3dBrb2Gt7dBvNkukFWaaaO0foP8eo5R5P0yBImuEr2NADTBnq31lwWS/0mnHvqZhMEiMkplV11j7qajXStdPoQGwPVEn0SI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=M6guzDsq; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M6guzDsq" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-81e8a9d521dso1180515b3a.2 for ; Sat, 07 Feb 2026 15:29:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770506990; x=1771111790; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=v3IrltYgdwJMBJH6ZoHd1x1fw2BBLHq1kcsJPRiYpys=; b=M6guzDsqj2rhBsrgaMXqL3gp7WgKFSH9ntKm6EqwUxKjUmUeEPZ4wqtnVpFuex2j2r Y9c3dRKd2haThe43jZQ6rF4m3RCPWXnLYSsXW1MJBlkHsgoBCZwB5V8Jr/IhJfIyUiID /yLQ3AldObaSDnirLEQ++qjKUjf1aaRFLT2Dl9AP9IgCraSvA+neABwck76Xl5ypRQ83 qXt2wZI2uXC3c2pzexWWMDt5qbuaoybh7ps6j7glAPIF3EY2afv5WdVOkh4plGjw8hbD p/Q1zGlGYlbiNW0Vnq+UhS4xXSEQMZfje8yi/RTjdllGY0l5LEt3us/hFJ0I2xG8bDJO MsSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770506990; x=1771111790; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=v3IrltYgdwJMBJH6ZoHd1x1fw2BBLHq1kcsJPRiYpys=; b=NDOSDmHz26kZIMkaJNQ/hh3xn8ZKJtxMNfyvv5HLXqLcdjQ/cyJpMtpnfWEEP6dEHk tufi7067bUd4dqRXlE4u8MYzvFwb23HtNi4YSllCuw1c9ESf6o8WA9SJxuzUZGRzgoeN q6/pRVqkl9SQfFOKUKddXoorlZkoHT3KeiGmCUx5a4XAc21g3WdgoL9Vg8GeRUH2ejzP P4LuxQoHdyfxIHZqvbC7be10FAmXcB6mZGBwc9QSr1Bq4WuEcrwjRYCrMDXePlryfEwA 2Zd8ZYoc5qlPFvQoeKK4Xs2GwyeJhP7qjVF6DkAggDKwYdYNo6NbnKgd8V64LFxvs+7p s9Ig== X-Forwarded-Encrypted: i=1; AJvYcCXl6+C/UbKLL1+wROwQbl1P5gcQTKyOEbwnfb+BoNOAm03Vl/r1fo/8iQ4u5hipIFVgP2IOOTQ4WlYgUf0=@vger.kernel.org X-Gm-Message-State: AOJu0YyOAjPvoRQR33M/eBCrTGm7GrE4GHEunnQPPe9bzfxiPXu9cik4 tvyZY3ToXv8UR1RycJU4GZdmOUCqC3tC/dvzr2orBFHaFCjrAbdoyRAmhtKF+RJ6 X-Gm-Gg: AZuq6aIorLGwn8TEDsuy4cd11/5zBJfuI/lz/q0kZ5Ehsbm2wFTiojOxfrd0x2mtbUC wtH3b2qlqVkK+w5swhXOh2yg+56m/gM9kQezH/po1Vhuy0mxzi9LR2YxwFaw1IWuBDXauF+Gffu yK7OPMlCiHRTC1d56jrmeo2Sl0JQVYyQxsxqfcXbVene1Ga9FEebc+qCDbs71VCnwCRpSKG/UZu mkdq3BLNKBxxe3qXGeXxztEPuVxt8M5Q1UsOQwmCFfcnsLFa3rBVFs6vADi7QFViooZF7pIeCsl fWZUMJhNdGI+6xQ+yGF3LqXkQMu4BUtF48Z1Ri6I2cLDbJ4VLtwzdmJZBh1RXroErw65fCU9W0j mzL3y/9lVlxRH78neiIWVQKpg9GWYiTyowMp1Xan3GSLkYgJMWBK1BouPlC9n/N826JDTqAO3Jj 1AI0adYJ5EQZb6l+qHUjYVeUUs3M1S+b53KuiBEBHC5g== X-Received: by 2002:a05:6a00:2da5:b0:81c:96b7:7faa with SMTP id d2e1a72fcca58-824416e485bmr6390145b3a.41.1770506990450; Sat, 07 Feb 2026 15:29:50 -0800 (PST) Received: from fedora.domain.name ([2401:4900:1c80:515a:e2d8:fc5e:e39d:5717]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82459b1190esm2325739b3a.37.2026.02.07.15.29.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Feb 2026 15:29:49 -0800 (PST) From: Rajveer Chaudhari To: herbert@gondor.apana.org.au, davem@davemloft.net Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Rajveer Chaudhari Subject: [PATCH] crypto: drbg - convert to guard(mutex) Date: Sun, 8 Feb 2026 04:59:25 +0530 Message-ID: <20260207232925.80976-1-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replaced old manual mutex locking/unlocking with new safe guard(mutex) in drbg_instantiate(). This ensures mutex gets unlocked on every return and prevents deadlocks. Signed-off-by: Rajveer Chaudhari --- crypto/drbg.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/crypto/drbg.c b/crypto/drbg.c index 1d433dae9955..d52a7bd07322 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -103,6 +103,7 @@ #include #include #include +#include =20 /*************************************************************** * Backend cipher definitions available to DRBG @@ -1349,7 +1350,7 @@ static int drbg_instantiate(struct drbg_state *drbg, = struct drbg_string *pers, =20 pr_devel("DRBG: Initializing DRBG core %d with prediction resistance " "%s\n", coreref, str_enabled_disabled(pr)); - mutex_lock(&drbg->drbg_mutex); + guard(mutex)(&drbg->drbg_mutex); =20 /* 9.1 step 1 is implicit with the selected DRBG type */ =20 @@ -1370,7 +1371,7 @@ static int drbg_instantiate(struct drbg_state *drbg, = struct drbg_string *pers, =20 ret =3D drbg_alloc_state(drbg); if (ret) - goto unlock; + return ret; =20 ret =3D drbg_prepare_hrng(drbg); if (ret) @@ -1384,15 +1385,9 @@ static int drbg_instantiate(struct drbg_state *drbg,= struct drbg_string *pers, if (ret && !reseed) goto free_everything; =20 - mutex_unlock(&drbg->drbg_mutex); - return ret; - -unlock: - mutex_unlock(&drbg->drbg_mutex); return ret; =20 free_everything: - mutex_unlock(&drbg->drbg_mutex); drbg_uninstantiate(drbg); return ret; } --=20 2.52.0