Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8372942ybl; Thu, 16 Jan 2020 15:33:57 -0800 (PST) X-Google-Smtp-Source: APXvYqydEM+duHuPiSjh7Fk9Tw0IGatMaop6UAPJX7locp8tjSktUE8MZxc4OmeHF4EAqhjP7xQo X-Received: by 2002:aca:ba46:: with SMTP id k67mr1367842oif.38.1579217637016; Thu, 16 Jan 2020 15:33:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579217637; cv=none; d=google.com; s=arc-20160816; b=DbmtJaWy2ZMZJHITC4+bqxVlUVe4jf1S9kBSnkyCbnaxvxr0COPXzY7xWzKTkDyJ4Z 05tjXMhdHf8n3NmX53fmlGxaw1XkcFxOpS1PCGzDKn+hVidKZqeHs8+Pv+i5Q/jZ6ccs ALZHWxpLJKFKVxRSMaedK/qG7IMjb5FlxGaKcr+1lKXJWDySxjXEVStahh7SYzWsp+Hv A1+MFw1RR7cjLQ5s10mRTkL0faiwUa+m8r+VNK1PoxjEGyczz4V7f4cVibH+q6HZ/Ya9 a9iF2amq6E/HU8voJN2yzPdr+OSjgP5UdZ/wayyNTZVCkrlEavKFmYkERvaneNDTD73g 1MpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hmAICC4TmL0kvo+Qeyu98YiU5U/grDmURNAEWR3Yfb0=; b=hsKBYW4mL8InZw8iEPwHDxj3w6PZtp0y+d6Eexcb152oLeLIsw1xAybPFc/o3gRVeb BaQMDoLHlvC+J0fACD1WNBpogfRcAKFzJUS2dbkpZF2EiGIwc3XHsDxo7nZg8ysxi2qc x6foFW5m/ajrTyb3Zj52GzTFvbKz+UhdAkeuvB+9qHxwEB/KjvLKLKuRSizBXtH2GcCe ARz3cJi+DdozllzvlqLftSR1ftiIA6sEaEL7NyANAEco6IMJapRxjcdR9OIKiyQ3PnP2 NRPIJJCUtmnGGlkzCD5Z9gQRO1+FGeFfujQmWMSVqNb2bRqUODGZ74EBV6D5NtUuD8Lr L3ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2TafAsYe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f60si14250004otf.119.2020.01.16.15.33.44; Thu, 16 Jan 2020 15:33:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2TafAsYe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391439AbgAPXaz (ORCPT + 99 others); Thu, 16 Jan 2020 18:30:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:36972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403838AbgAPXaS (ORCPT ); Thu, 16 Jan 2020 18:30:18 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 486242072E; Thu, 16 Jan 2020 23:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217417; bh=SI/+LUsCkOv6mqjlDDK/Lkt8c1rVlXx+mAffa9wYcvE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2TafAsYeW4jihm58c/c7/rv/JuoVuiuCaslH/AzN1nbo+cVqr1/1uZdjU6Ud1qba4 z4oy7E8eFSSCPcmHWB1wc3SOsO153E0hNQuDw3gYIv40T/jJJoJAMAYOhSUzkyiK3l 8IvwpVFySVN2iRnUJo3xYxREqHBinVbsGAnRTh+A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shuah Khan , Sasha Levin Subject: [PATCH 4.19 75/84] selftests: firmware: Fix it to do root uid check and skip Date: Fri, 17 Jan 2020 00:18:49 +0100 Message-Id: <20200116231722.365608827@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231713.087649517@linuxfoundation.org> References: <20200116231713.087649517@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shuah Khan [ Upstream commit c65e41538b04e0d64a673828745a00cb68a24371 ] firmware attempts to load test modules that require root access and fail. Fix it to check for root uid and exit with skip code instead. Before this fix: selftests: firmware: fw_run_tests.sh modprobe: ERROR: could not insert 'test_firmware': Operation not permitted You must have the following enabled in your kernel: CONFIG_TEST_FIRMWARE=y CONFIG_FW_LOADER=y CONFIG_FW_LOADER_USER_HELPER=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y not ok 1 selftests: firmware: fw_run_tests.sh # SKIP With this fix: selftests: firmware: fw_run_tests.sh skip all tests: must be run as root not ok 1 selftests: firmware: fw_run_tests.sh # SKIP Signed-off-by: Shuah Khan Reviwed-by: Greg Kroah-Hartman Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/testing/selftests/firmware/fw_lib.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/firmware/fw_lib.sh b/tools/testing/selftests/firmware/fw_lib.sh index 1cbb12e284a6..8a853ace55a2 100755 --- a/tools/testing/selftests/firmware/fw_lib.sh +++ b/tools/testing/selftests/firmware/fw_lib.sh @@ -28,6 +28,12 @@ test_modprobe() check_mods() { + local uid=$(id -u) + if [ $uid -ne 0 ]; then + echo "skip all tests: must be run as root" >&2 + exit $ksft_skip + fi + trap "test_modprobe" EXIT if [ ! -d $DIR ]; then modprobe test_firmware -- 2.20.1