From patchwork Fri Dec 15 19:55:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary R Hook X-Patchwork-Id: 10115937 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B4EED6019C for ; Fri, 15 Dec 2017 19:56:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6AB5290E7 for ; Fri, 15 Dec 2017 19:56:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B58A2A138; Fri, 15 Dec 2017 19:56:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92FEC290E7 for ; Fri, 15 Dec 2017 19:56:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755802AbdLOT4G (ORCPT ); Fri, 15 Dec 2017 14:56:06 -0500 Received: from mail-bl2nam02on0050.outbound.protection.outlook.com ([104.47.38.50]:61028 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755727AbdLOT4F (ORCPT ); Fri, 15 Dec 2017 14:56:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ERusWwsg+tOI+3nkigoX/J2ezPaxES6t8hLO1SRXnFY=; b=szyUM0GM3RgPnLCRS52svEVgMdAfvHshsxy5yutDVJmpV55jwpGz5ruiFSGxYwy+/LMedE3J3GH5XsJEO7yS/kcWgGDnqAYuJxTWlTyEmZ7kzvkgZUn5axlAQ/pIv7E54zqdP0bPWPorUqFErTDmIeNJ2ksS9DQuVExcSviS/uo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Gary.Hook@amd.com; Received: from sosxen2.amd.com (165.204.78.1) by DM5PR12MB1209.namprd12.prod.outlook.com (10.168.237.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Fri, 15 Dec 2017 19:56:03 +0000 Subject: [PATCH v2] hwrng: Clean up RNG list when last hwrng is unregistered From: Gary R Hook To: linux-crypto@vger.kernel.org Cc: thomas.lendacky@amd.com, herbert@gondor.apana.org.au, davem@davemloft.net Date: Fri, 15 Dec 2017 13:55:59 -0600 Message-ID: <151336772989.60446.16322941485803241258.stgit@sosxen2.amd.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: MWHPR1701CA0015.namprd17.prod.outlook.com (10.172.58.25) To DM5PR12MB1209.namprd12.prod.outlook.com (10.168.237.12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e119e43f-024f-4068-a841-08d543f5df7e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603307); SRVR:DM5PR12MB1209; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1209; 3:bmKuCv5LJ9lVJZkhnVtCApUFHcHpLP1DJc+68QUR0BBX8inJxPZhSKawD08qRgErhpFLHNjYVwFRht2txW6PtUuwRZZMIeiJN5i4/fFnSygCINjgHvBvWuowvRpPob7cnen+lrLklKKZPYJKdErTxmTXcXBW4YJ91GVTMGSSE3bOBfH9asmHBVKYg+9rVNLpVujO0NReCnf11Z+6JjDZZDStJawj2nLU6+3LtP0x3FaR4CHyynMPeCtdz9XpD2FU; 25:dr03b/o86h/rkBLJSWIRooz3RLE2BwhFZkD7SlKlEDO3T2k3aXM5RbyvfohuwpcCm/bz9fFIbHOiC/zdEbsRY8tM6AX0fgvo2WFa4U7tNjeOo0FnT86KRHKqVttSQpQUR3fadI+FMcIVfW3hOz2KIYI2u0n/6eznx/W7ZGyMcqC+cjUNgc49dT72oUL1I6b13DqSI+JB4jZwP8OYRg+P6QQNXba0HLqEVLN59kikJuxahH9iJnwh0/YKwWWfEtpINfmQ6xwEE32yDSVTbgQSumef4wbqM4y8nuzwrAntXglRXUk1Pf4yeFWul2+7Mx+9b4Hhgty8oXkAHKeGRXXewQ==; 31:kT5YGvE9tJw1uAf2W51Z8u11s3DSRrIGYTohdYFExs7HpH3SETCFZZ+WhVgJ3SvUSAFayWfTZwL+F5P9usy1DTF4Pnzg6TuZmgKSNJP/otk2FyeM2+6fCwJ+gdXEfKx3VMtcY/UDQHpkXDTegQ4nH6HbMtFFaEVavNRRxZEh7jboPrkJTa8ixy5l0S0GhEsMvhKn5MAqp30MKM94jWRzXT2vMoBLWnmx61ta5v0aHt0= X-MS-TrafficTypeDiagnostic: DM5PR12MB1209: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1209; 20:pSIuRb7y3MU3mCWMwrkfhMblYPrP9dDivMkm6UxnWFefO/3A8vdgepgmyAG3+txyUjxhhiMk6+UDq4k6RLimNiXizRCG85R4Gl3F9br0Hif8NX72PxdZSQyFz9rfZi9MF6cLNISLkYy5ZDTILYe7ljpD57y//B3eJRixH+7BW7ZCY8lZemR0E+0dXrzyGXE/2zGm6xbC1xtjf+dQLunqyzzwmrOMsgKt78doc7nUneEOwnA3VJ2q7Zrk25lgfXZ6TjQ7Fgix4bbgcTkrHcM3SbvllLGxVwMooSNOKkmOH4lo9ZkP9mF8yh26IiycdkIIxwE3fsVGxsnE5jHbtiaCxCJ2GLanwlWjRRC/ZszIxyyFdbW57LVc+WWTqOCvAuVOnmy3Wn521xOYD91IgHCzpG2vKJR62gugOM3vri0VccBZ+8Y1hEw4/kGO7uynel66AjyDsv9RFR3yTjDdYTEciXOkecFmh4G8kSnrxAqH/cmbFvL6merP6jag7DzpYJOC; 4:OzU9je5Eib7tGvzB5nE7s0LKYw8Q1L1/O4O28VAv0mvTTzvbOf37EDrvxLdch17VIB/SpTcfXzMaXQt5KJTFkE/mfFNU/Wuved0VudrM7FVmKrhXCL0yuT45ep5AUQwQ6I+0rwiXLCbPW5PhZJmZTqWrweh1TIbb3aLkbb1PkF2sSlGIjvedOaI11GcXAw7DN66K9NtPYsZ7qTRxjqMWfC2YtELZbaq/ckz0fYsKb/B5uE56vnUsegHe7cKs7pdi2YGK2CxXMnegPt7sr25HUDqGa3NapMbh4DyoRohv7LBc7JoR63tMMiHbk87iXnMS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(3231023)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011); SRVR:DM5PR12MB1209; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM5PR12MB1209; X-Forefront-PRVS: 05220145DE X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(376002)(39860400002)(346002)(189003)(199004)(81166006)(50466002)(4326008)(5660300001)(53936002)(53416004)(81156014)(68736007)(8936002)(2906002)(2351001)(6666003)(2361001)(23676004)(2486003)(52116002)(6116002)(3846002)(105586002)(230700001)(8676002)(25786009)(16526018)(55016002)(103116003)(97736004)(106356001)(58126008)(478600001)(7736002)(386003)(66066001)(575784001)(7696005)(316002)(86362001)(47776003)(72206003)(83506002)(305945005)(6916009); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1209; H:sosxen2.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjEyTUIxMjA5OzIzOnJnQXhDeksxVGduVnFsN1RZQnFpOVFyb2tD?= =?utf-8?B?N3plQkNydWJuWnJPNzd1NzJaK2VMRWZsTURva3hRWnFGMWN6cGExWGNyeGdJ?= =?utf-8?B?RGpoZlVkeGt6VjdtNkVkaVN1WUQ2VVIwYXRPaU1wa2lxLzEwbzZIOGFHL3hj?= =?utf-8?B?dUhFWGJvYzVtNWZBR1JCZ2JVMTFBWjZmQ1NsdWlyVXFPUUNOZTB2M1Z1QktL?= =?utf-8?B?eG1yQlBLaDd0NzBMS3BwT2pRdmZ1V2w4a2NYSVhIM2ZOZnJPYkY1VlVNOW9E?= =?utf-8?B?K3ZQUHR5MHhlTWR5QjVrWXdIZlBaYUFwS3ZiRzFxUm5NUFFBNlZmYlBmcDE0?= =?utf-8?B?eXhMcHd2S2dpUXFKT3BoZjQvRVdaeEJkNUpQMERoMjQzK3JxWW16Mk5LL0oz?= =?utf-8?B?UGRaa2laZSt5UWRKVENQVkNzL295WXNJdUxIVVhwZVpncDkzTExTaXJPSHVL?= =?utf-8?B?emcxdjRLaHJsbnczYy9QQ2l4N0pGNjluK0RXZUtPSFgyOFJQS0trTk9MeWhV?= =?utf-8?B?RGpWZVdQK3VVN25FTzlqOWh2SUkzcnhCa0FZbUhpYjJXWVZzN0pxYUJUM3Jr?= =?utf-8?B?TGRVNHVsd0xrWlY2RlArSzNJdFFsRnFvWkNSOUxCa0IxeVNTUGpZNDQ1V3Rq?= =?utf-8?B?eVVxM3JhczdkL3NJRWRvR1NYM2hINFZIUWlwUmVVaXVTTkgyb0VxYXgyNXcy?= =?utf-8?B?QWNXQ2MwR1ZBOEt5bzJEOHB2dHRYYmFKbHJkTzZxemN6NHdYZllnYTBFVjB0?= =?utf-8?B?d2sya3ljeFBRdDRZMVduZzdETm1EYzRzc2RBOHQyNHVES3l1ckVRSkhlaHlP?= =?utf-8?B?QmhhKzU4WG83T0dzcGtpUUxTUmYrVnprRzZ3Um00cFp0YW1YYlArditRbG11?= =?utf-8?B?bGJWNHQxRDBiRjhzWG0zQ2MxbFhhODNJT0llQXN5MmQwaDhyUzZDWm8veWhF?= =?utf-8?B?OXFMSVRmR1E5cldYWWJjRU1jcElUZlFvd3E2ZGFpM1VIaUsyMUtOandxM00w?= =?utf-8?B?dHBNTnF1UFN0bFFqTklZcFpFR0hqcXl4TzFiQ1BpU0w0S2VWVHZkMTk1VFlr?= =?utf-8?B?VHJ1U2ZFaHJZQ1VDWVJRWEoydzlvUFlaUDRnZ1J1UTdUN3hTVlVmTDF1bDZ3?= =?utf-8?B?bjIvdE1rQUtqSmJTR0MxTjlyQnl0THlFVGU5NFVjZkxDQzR4dXJSa2JFZmR3?= =?utf-8?B?cmhnbEdmNDRwd2ptNFltczBiOUVydmtEOTExcHg3YTZ4cEhIWDlQVHlWUHVq?= =?utf-8?B?c0trUnJhU0ZmT3RCVmkrTUV1THlJWklHalRkcFdMamlVN1QvdmZ5NEp3bXE2?= =?utf-8?B?QTNyL00raVBMa2g1ajVTMURRY3FLTHhHWkxYTm9MWGkxVmg1NmV4Qjl5am51?= =?utf-8?B?U21HRVVKZGNCV0prSTloQVBLRFdka0I1OXFCOUt0SWs0OTFmYkFpNjJmZ2F2?= =?utf-8?B?empFN0I4TW1jZ1ZmbXV5RUJPZVM2MVN5Uy9PcUFUdy85NlBjUExXK2ViN2wx?= =?utf-8?B?M1RTQT09?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1209; 6:AwhlFy+8+NO8H3+1A+GwZ6OhLGpOsEJR1ptKy9MzGMIIZseCSoyJDIdoWwUV+EJfeAdN2EC7JV1Dv1hgPDwxv5LII4Yyg6SiptxQIqTyM49dlDUxTL1FYmLw8XTu0+S+RkoyZgIQr2E+j6lc67qTbpDgTB5SzkDk2OuQak2zm/MLDdGpkca7LroLWdtTdfZ3lM/S0Ua7jfYl6KzeodL1dzDOftjP+f4EabvIcmEevF+uDqVW2vrooAAgswDspzjcispzeWP/rGKI14FXZO6QlNQxqULVz/XQR3ubO9jnVLfKYfV7dvNMDcF2VLP6szpERsGs9FxccISFUlCrX6+O8R5eNZ80t2XO90sQJzL/0dY=; 5:VDOS8LxKbX6wQvZJILfPahQrFs6hAL6PzzTdjpzNg9sjwVqY5VhEpu7q7U03jULGwEirGulrDup+ekD8OSX9A3RKdvFDbwcIcW/4tsKLxqeT/8YQapgkHEjzya3ITbBKl7E6uu/KB9rS5c3RvinWStTYCwfz+b50DcfI2GfeVk4=; 24:obZvdfebUKneaDOPENGnk1vYRakrYVsgyCUfiU9wGnFBXg+nHN26Y1dG6K9vai1Z4YB5cnsHEWbG/DIo86ThlNzVo6ZRQ37yTKq9/qKRY7s=; 7:XNwBBU3YxXn/4tabAo/Es48NVpeyKN+Tmx3j5AlHoTU++pBSmvfEuaZtj5sGMBheN/dwFQK/pxw4LpPrwTnm6i8dAbWhhNrSjx1qlqwT6i6PbYpXtAD3az6ZapAWiT9/kmzEiPVOHby+HRWyDPKEAbfPNXmoaqZEqAXKlHtM8jyedjm9+txlU5jS90nVtwwjfeCevWbYHWFzswSUqztk3QAXteXEE0/sAmHczp43hfHhHeGU61Wmk6ODzhBh8iI8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1209; 20:xggusoDc7Xrd5VaF1kxNhFD04NO3cQyAyYh30wqKGEwFz/mT2N+XyabwoYkxNzTjOtUHifyPMyWoZgfS7Bh1Ludv5HBfSWr0uAnGXaT9/kWvnXzUM9sLhoC3bcDTxpHov+BupzE4XXtEkAtL20KIdBw2yTxT2FuNPNnptc6y29RgdqdGp2Jqr56vXhNiwlHSWp5iKkmQF9hSbFiyMdSbXNqw2mm63TA7o/aJsZ7OSnCNkounQULr94P+pCddSqBf X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2017 19:56:03.0023 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e119e43f-024f-4068-a841-08d543f5df7e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1209 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 "" to rng_current") Signed-off-by: Gary R Hook Reviewed-by: PrasannaKumar Muralidharan --- Changes since v1: fix misspelled word in subject 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 = ((new_rng == current_rng) ? 0 : set_current_rng(new_rng)); if (!ret) cur_rng_set_by_user = 0; + } else { + drop_current_rng(); + cur_rng_set_by_user = 0; + ret = 0; } return ret;