From nobody Thu Apr 2 09:12:33 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 652D92E3AF1 for ; Sun, 1 Mar 2026 12:08:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772366889; cv=none; b=ab3LLlaG1XVFRnmLL+R7WVg9iVWe+g5LF+SQBUeP96AJub+yx1Ktvh+zIHUxumpGA/K+SdA/IXQ+KXkcnn7qEhFSTeQYvPIYoSUiazjJFJ3el2OeYZ3nc8tOQgLvFZk+jogkkXCsfyogzS8EX2DeSGFRZn2w4IRaOA/OJHOUEvo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772366889; c=relaxed/simple; bh=cuvQUE2Fhntyo9wZzFh6Sr6QfYFezsxo+UdSSyYB44w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WYtHspcGmOrwxtlGzEWok6Vei+qlaR1DxGvVsSnwKLkSwS/geubNz+gMs70rQKVUEBV1QxZOWHThQYdbnSVlzQFxu/HQbb1ykUh8vdwLyZ+x+Auvaf3eWyHtzXSSmrj0tWS0GysNL4imBOhW4eokLZkLPNKomkoNt6Aroijqnw4= 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=MlgJVs6I; arc=none smtp.client-ip=209.85.210.171 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="MlgJVs6I" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-823c56765fdso1719918b3a.1 for ; Sun, 01 Mar 2026 04:08:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772366887; x=1772971687; 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=qG1HgotwU2avY/4uG3n4wNhHxPZiFDdyIpVyiHq5gWs=; b=MlgJVs6IDPPF2YdwSDQtX9E5OrdhIO/10jF7XYiAzs1e3vYUXFmi1hJHW7PDNd0WnD 4+eHjL1v2crZ/Wsk+gugcfDXZ9DnZvyfaeKmvCKpowGjdrBtga5pcEtOLYlcf0+u0ZKG veBn0z4F3ou9xodTgslYxDj3v+O39neGcQ6l1+/LCIWUwrwVFWMQBrr1+8MGpKFbqR8e KdB7V9I+iunSl0PT6ydg5iHaPv9iN0AboEolDv7gBKlUoZLSz2g+hBoMI1EZ7OTDG5Td Q4l3R/ri7ZHvwQj5t5auNtTmbqVVwi7Hg8BNmTFIlYFJ8PWYUZi+FcLKUxJX6679thJP xniQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772366887; x=1772971687; 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=qG1HgotwU2avY/4uG3n4wNhHxPZiFDdyIpVyiHq5gWs=; b=SuH5TkcYEk4dPCOqQ5Mzk5/OA6M1HK5aag1be6xAgmtH0jmSODt2FxhcebuzxIHUw2 cfy5lfjKtul6rVTEyE4+CNbrC7EhptKrrabolC23e8mDaO8cpCJJ4FS3mbPCr/rgk9yN zp5Y84PJTwUcU8iE5AZsnwSOO8aDFctp1FzPD8uPVnd+AlaMPK8AObzRzcqXawmtHfPi RWi/hZs9z2YTI6XD/Ka0ZznNG77d1Zk7QzEomVrOqb/xDuUkxZZ7fB2cNVDBurK7ldo7 sEOJ8QFcggYGacIRuzrhwB7su2Hs4/xMPbfas+RV17AEy+zqPoeqAXiYP2uLYvH+OKyK bDCA== X-Forwarded-Encrypted: i=1; AJvYcCXm7vRSxNZNjTVOhb0HZxBohQ6IakigqLXfe3ab8oYfAAEstRN794wyADV0VHVMBybJWFSmB6E0V//Gppc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6U9nlut1XTsyiX6ktaDarlJkhqO+Dr7+5QIx5ivoQo76bLDcE S1SmWZWnFmsaBqkAV0bdvez6S9GVDrY29RWtOKyva3ox3Xjm+IrSd5PY X-Gm-Gg: ATEYQzzEp1uYc8YXZfPqqhdZE2FO/yeIwlAXr65aVXP8zwO60Bj6Hgr2Tgc7c0C+DsH tlJ8wk+AzcBlX69yDlD/13HDx7NzUbyBa3XyI82RK6Qnq4I/gt+xQ4FdnQKvF4y/eVnnvvxM00q 5mAwNVcN6sdTdHKy/1v9oLEgNgKu5LsRYJGgb3DYjYS3fRlwnjtFJYXCTwyt4gMG15knHezDqtF hJBmQgTm/Zeu/N5kHwKT85nraF+zROZi3Q2dvi+YKjrIkf/AGuSHY50MKL9/leRtheGufe54Cp4 4+HZBGnP1+AUxHk062enNPikFT7OBXnNzL8Z2CWqKi/TbmCES4tM2VovFt1t8Zv0faA5IIkJLm3 tAoZ6Aw9jjSQyXfGivS3nq2Gg2mT3NE3GRxckJU+ke6uqSrf6Uyw4x23WgslgNTBp3pUm2vs8p8 Gl5xNpgFGOcV4VTh+htjjd9khVuy+BuLMBn03zf+8uD4JRsnbzq5EtjvU/5QzQFr+DPBQ7/AtdP QeidaLq097kRR9dI7uEzMZSKhahJeRq8NBsxR9LaA== X-Received: by 2002:aa7:88d6:0:b0:824:9eaf:54ea with SMTP id d2e1a72fcca58-8274d977cb2mr7122908b3a.28.1772366886513; Sun, 01 Mar 2026 04:08:06 -0800 (PST) Received: from fedora.domain.name ([2401:4900:1c80:eb23:e561:7e2a:9fa:6245]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8273a088517sm10228077b3a.65.2026.03.01.04.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2026 04:08:05 -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 v2] crypto: drbg - convert to guard(mutex) Date: Sun, 1 Mar 2026 17:37:43 +0530 Message-ID: <20260301120743.27041-1-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.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 --- v2: Fix linux/ header ordering alphabetically --- crypto/drbg.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/crypto/drbg.c b/crypto/drbg.c index 1d433dae9955..5dba9be568bd 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -100,8 +100,9 @@ #include #include #include -#include +#include #include +#include #include =20 /*************************************************************** @@ -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.53.0