From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1145125-1520116626-2-18204072772146945972 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.249, 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=1520116626; b=C+rESvnHDSPhKxdO0GUG3Xn5vLdguvQJubj35PtdhhODddH ZligXgPwmHbdAsOlOy9sdlsOt23D4k/eLPS9jto6uciYYCF8fEbJF3zg1o17IDL8 P5MgNBR2vSaGmsOKEOrqI1IxOCV+6vaAHzCnvhh2CjPoIkihriZ3P1jK92KpQvO2 Lk9qaC0SfWU7daz1kcUwr0yeksNJF4olQ3usH+LEJbHUuASwX4K5HbdoppT/tomV DywSD44TgZLisoOvSqOAukyLhFQdJpv7eEbF47QPNlscr7iwe+mUdlLSX5Opuz0+ ovTU7DbhGB/49OdKw7HVi4Ue0BzaY2eeBW+OUUQ== 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=1520116626; bh=sgg5e0 /lUreyXvszM1vHxSbGIWrJp/frSOCQnaoYWUY=; b=fTWaTX5sU4rAr6VJ4hkySr 1qD8qyoXY685Vljz3DnhAHxGkHHnRAGWQqcG9RvLPysc6PHRBxKuokhVfRg3kdAd 8J2CxuxB7jZJ98TwilThErnmc28mumkLpKpG7pn7PFDno/EHZzK5EXEvsGsC7WOK zcdQbJHe88Y1uKtK6z2KyBY8BPB9jJIHYHVHB21aWr91xr/yuohvhqe0FuM2gWWK CmzaDYYmQGf2DfxoCkpATCOx5hmBQf/xP07y5YVWEcgVsViygEjEMf0Mmdccg1aN YNJ/1dXZg6KT1FPke8aSMnQI8rPQDPGg6taVJAm2AvVIfHXt7MUfqtnT4XrWIYsw == 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=SlCAxC2P 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-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=SlCAxC2P 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-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 S933600AbeCCWgT (ORCPT ); Sat, 3 Mar 2018 17:36:19 -0500 Received: from mail-by2nam03on0118.outbound.protection.outlook.com ([104.47.42.118]:7707 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934506AbeCCWgN (ORCPT ); Sat, 3 Mar 2018 17:36:13 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: "Luis R. Rodriguez" , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 179/219] test_firmware: fix setting old custom fw path back on exit Thread-Topic: [PATCH AUTOSEL for 4.9 179/219] test_firmware: fix setting old custom fw path back on exit Thread-Index: AQHTsz8f1RAhmcVCf0+ENO/SWwckUw== Date: Sat, 3 Mar 2018 22:29:41 +0000 Message-ID: <20180303222716.26640-179-alexander.levin@microsoft.com> References: <20180303222716.26640-1-alexander.levin@microsoft.com> In-Reply-To: <20180303222716.26640-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;MW2PR2101MB1020;7:UfSiyCPaDT+OgxgO1pOesnkauw+OCFTh/nUwahebGtfZ7UuhW8CQutPsGKORXJSa/gkOT20seSau7Jpdqqpib49OK54qO+5SJRQeweShWBC+Veut4ldv3fSP7YXJvo5fIxcbJ1Od6utZ1aZhnONCagY9bllzA1OtjxhkQa9bmI4MzCMhNN+vrhNWAoK4enJWoWJahRaPnEWhp3uuQtGsPLejvleoFOXA+OKw75Jh9jPCLjzHR9W6oqxsJ8KDXQt/ x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 145f664c-2417-4688-e98e-08d5815728e3 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7193020);SRVR:MW2PR2101MB1020; x-ms-traffictypediagnostic: MW2PR2101MB1020: 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); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231220)(944501244)(52105095)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:MW2PR2101MB1020;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1020; x-forefront-prvs: 0600F93FE1 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(396003)(366004)(346002)(376002)(39860400002)(199004)(189003)(6436002)(5250100002)(99286004)(3846002)(6116002)(8936002)(22452003)(86612001)(86362001)(575784001)(4326008)(10090500001)(68736007)(6512007)(7736002)(97736004)(25786009)(76176011)(1076002)(6486002)(2501003)(66066001)(36756003)(107886003)(2950100002)(8676002)(305945005)(5660300001)(105586002)(53936002)(6666003)(3280700002)(81166006)(6506007)(106356001)(2906002)(81156014)(316002)(478600001)(72206003)(10290500003)(2900100001)(54906003)(110136005)(59450400001)(186003)(102836004)(26005)(14454004)(3660700001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1020;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: ZUw/BGh05FuEPPtPaIg9PnCrkQxb0PnHuWSDHyYs0QcZ1Sq2XZEB3LCVmEcXEqIa1FrEcoqC+ORFAo0L+QhvMMha9r1TzDzqfPhN3aI/LVZRK0Rgw9KnVD2/RgkbSI222DRSQ3ifA1AeBJlPreyHIb8JsGXrssTI2zcRiQTcy44= 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: 145f664c-2417-4688-e98e-08d5815728e3 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:29:41.5726 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1020 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: "Luis R. Rodriguez" [ Upstream commit 65c79230576873b312c3599479c1e42355c9f349 ] The file /sys/module/firmware_class/parameters/path can be used to set a custom firmware path. The fw_filesystem.sh script creates a temporary directory to add a test firmware file to be used during testing, in order for this to work it uses the custom path syfs file and it was supposed to reset back the file on execution exit. The script failed to do this due to a typo, it was using OLD_PATH instead of OLD_FWPATH, since its inception since v3.17. Its not as easy to just keep the old setting, it turns out that resetting an empty setting won't actually do what we want, we need to check if it was empty and set an empty space. Without this we end up having the temporary path always set after we run these tests. Fixes: 0a8adf58475 ("test: add firmware_class loader test") Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- tools/testing/selftests/firmware/fw_filesystem.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/test= ing/selftests/firmware/fw_filesystem.sh index d8ac9ba67688..17e16fcaa0cc 100755 --- a/tools/testing/selftests/firmware/fw_filesystem.sh +++ b/tools/testing/selftests/firmware/fw_filesystem.sh @@ -28,7 +28,10 @@ test_finish() if [ "$HAS_FW_LOADER_USER_HELPER" =3D "yes" ]; then echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout fi - echo -n "$OLD_PATH" >/sys/module/firmware_class/parameters/path + if [ "$OLD_FWPATH" =3D "" ]; then + OLD_FWPATH=3D" " + fi + echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path rm -f "$FW" rmdir "$FWPATH" } --=20 2.14.1