From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1131037-1520492005-2-9217902963323724848 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1520492005; b=igR7sanKcAKhsuVIJwGz8CHJd/d9MJo3W9R6WttKwMWbjRi dIA51WwnLUnNrFRNjVnHx66IY+TjmD4YYZg7uarlETWF234JxklT68eWfPNf9NKP wqByudUR40m0L2lKmtCR+BtRWcSbYOtvwfQdAGc911dck++PtKiW+SRCV7K93bQA AUpGUHI4mN2OEnCFDS7jSKqAlKr/zdAodvREh0/WWCVJS1vVSnQPl2lZCz/6otJZ 01WHkHV7Sbrd4enyf5vXgeEGVvTnMNLUl2wLFFOh/ahe2b5Yd9zlaWkTDgekDigj 5R6T4Ly81tYDa31zMH+omM5QAnNjmBaTWXC8AkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1520492005; bh=lsu5Bg ZCb2sNVfXOO3m62yStDZQwFdGNtPY3B1SskwM=; b=vO7x47SjznD282f6tTgOn/ S0pvLubiMCo2ZezdmhR4NwpB7joQA0y/2br0bwBYCzwR5KI8expBzJob9QGPBCUW FFFyWf4Yjc2a+RfhbsNSNDK5/9Qo+mz27YybUwZIhh3h0mTulJz7o828RtzATHoH 7gzhHdihUM7cSgGrZ15ZShQe5L8TKH3aTm/5l/lt5hv9MM81m8nhH5orBmMbDBgI sScEmEhQWDsJCkS2SxxTG6B48CZG/BJ4BbxpqES3ot+VGO2pVwjG1OcG8QhCLADm VfQTNLKu+6fhQmo4kdJ4RrH4Y+UJldFBk6nmZ+S4PqzlkCWrcW08qsmcr6kAuvbA == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=S3V8/A+r x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=S3V8/A+r x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965013AbeCHGxK (ORCPT ); Thu, 8 Mar 2018 01:53:10 -0500 Received: from mail-sn1nam02on0119.outbound.protection.outlook.com ([104.47.36.119]:48736 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964985AbeCHE6H (ORCPT ); Wed, 7 Mar 2018 23:58:07 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Gary R Hook , Herbert Xu , Sasha Levin Subject: [PATCH AUTOSEL for 4.15 77/78] hwrng: core - Clean up RNG list when last hwrng is unregistered Thread-Topic: [PATCH AUTOSEL for 4.15 77/78] hwrng: core - Clean up RNG list when last hwrng is unregistered Thread-Index: AQHTtpnVP2npb/4s3UWXbvw/Gw0pww== Date: Thu, 8 Mar 2018 04:56:35 +0000 Message-ID: <20180308045525.7662-77-alexander.levin@microsoft.com> References: <20180308045525.7662-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045525.7662-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0936;20:6Spr71FtkiLzWmiJkqgmb70bCI/HZnI/7O49z1xivE57XL8hnPzgQoSzE9XKr9zx8/5znWBf8C48VOEeg8hxtqmtGpQsFzBsoLkLx53lxGo56wBr7f9rq8Q7eyNrGhKOy+0HHh6L7U4Fdx6ASJJJnrdiyHC7VPpEuxJPRRHbQXI= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 34f4b649-a99f-41f9-580e-08d584b12b50 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0936; x-ms-traffictypediagnostic: DM5PR2101MB0936: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(767451399110); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231220)(944501244)(52105095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB0936;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0936; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(396003)(39860400002)(39380400002)(346002)(376002)(199004)(189003)(478600001)(99286004)(575784001)(6506007)(3660700001)(36756003)(86362001)(54906003)(6116002)(110136005)(2950100002)(102836004)(1076002)(3846002)(6486002)(3280700002)(10090500001)(10290500003)(305945005)(72206003)(6436002)(6666003)(26005)(5250100002)(2906002)(186003)(2501003)(105586002)(76176011)(66066001)(7736002)(68736007)(25786009)(8666007)(6512007)(106356001)(86612001)(8936002)(107886003)(81166006)(2900100001)(5660300001)(4326008)(81156014)(53936002)(14454004)(97736004)(316002)(22452003)(8676002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0936;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: 57o/fQ3RSj/ggKKEiNhXv5Erqyo/Un5Z/9Auy2pyfdvRO4Pmq6XNcZTrTu5x1XMSIFjaB1Aqw6UbsB+FernpFZcGEalvsigUmdWmxQ9grAPOydz0d0qNo84KbY72TyUCUvYYW3t0v2HdYGCQZ9FhCIoqOAfWwkkrpm1ijirGekT5poAZbiE1LJlWNOI/faZjUW9LKkGlkwq1JveL87b2CtfTFc7znsCLiteME81T0LiFBOxLR2tNcVheDGB+8dQ7EqbgLEidFhucJH80sydLfHLi28ZUxK1SqwCe5QCSnUmsBzdi9Fn52qn+4+h7VMJ+kXSBrn6ggriKcpxHJjCbSA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34f4b649-a99f-41f9-580e-08d584b12b50 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:56:35.6468 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0936 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Gary R Hook [ Upstream commit 0e4b52942b1c76f89e0dcb829f72e123d0678f54 ] Commit 142a27f0a731 added support for a "best" RNG, and in doing so introduced a hang from rmmod/modprobe -r when the last RNG on the list was unloaded. When the hwrng list is depleted, return the global variables to their original state and decrement all references to the object. Fixes: 142a27f0a731 ("hwrng: core - Reset user selected rng by writing "" t= o rng_current") Signed-off-by: Gary R Hook Reviewed-by: PrasannaKumar Muralidharan Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/char/hw_random/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c index 657b8770b6b9..91bb98c42a1c 100644 --- a/drivers/char/hw_random/core.c +++ b/drivers/char/hw_random/core.c @@ -306,6 +306,10 @@ static int enable_best_rng(void) ret =3D ((new_rng =3D=3D current_rng) ? 0 : set_current_rng(new_rng)); if (!ret) cur_rng_set_by_user =3D 0; + } else { + drop_current_rng(); + cur_rng_set_by_user =3D 0; + ret =3D 0; } =20 return ret; --=20 2.14.1