Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752351AbcDWSpW (ORCPT <rfc822;w@1wt.eu>);
	Sat, 23 Apr 2016 14:45:22 -0400
Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:33865 "EHLO
	shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1752300AbcDWSpU (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sat, 23 Apr 2016 14:45:20 -0400
Date: Sat, 23 Apr 2016 19:45:15 +0100
From: Ben Hutchings <ben@decadent.org.uk>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: David Howells <dhowells@redhat.com>, David Woodhouse <dwmw2@infradead.org>,
        keyrings@vger.kernel.org, linux-kernel@vger.kernel.org
Message-ID: <20160423184514.GO3348@decadent.org.uk>
References: <20160423184421.GL3348@decadent.org.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="31zvzas5NXT9fief"
Content-Disposition: inline
In-Reply-To: <20160423184421.GL3348@decadent.org.uk>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: ben@decadent.org.uk
Subject: [PATCH 3/3] module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE
 is enabled
X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000)
X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1714
Lines: 50


--31zvzas5NXT9fief
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Force-loading now fails if signature enforcement is enabled, so if
signature enforcement is statically enabled then we may as well
disable it completely.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 init/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init/Kconfig b/init/Kconfig
index e0d26162432e..269533088a1b 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1853,6 +1853,7 @@ if MODULES
 config MODULE_FORCE_LOAD
 	bool "Forced module loading"
 	default n
+	depends on !MODULE_SIG_FORCE
 	help
 	  Allow loading of modules without version information (ie. modprobe
 	  --force).  Forced module loading sets the 'F' (forced) taint flag and

--31zvzas5NXT9fief
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIVAwUBVxvCuue/yOyVhhEJAQouVhAAxJ0/i0Uz5S/2U9y8pUYN+c4y0lZWxHN5
1/ot2vWFG5jYB5rRDxuVd807Urcth8InAiKU502tXFIZxlvJkjNGr5VVfB1Z63oD
Dnf+Afvp+CCYNMcc9LktJvCN8u9UfT39bK5knGfc3sMr5HelZdkAI8hNtPKfQcj1
0E7H8DmtDwb68DwOUO/sl0h2Epn8nK0RbMWfTjUJQp6+inOZxk9mpXUutZiNbgIa
aIWIed7ZdQGzwSEveYYEQxJFWdVYY8DJf9Z3ivtRuPxvJ6/pxxvof3tdhw4tinWt
es81M1Xl+3CKo/vgr7FAly3vvsZ+vSWqxhJARKS48qokJQHckzz6jSZSyXHBXIR3
HKc2q33752w311agj8+ggyrjdJauoRtdW95HQC2hHzNb8VeYfNR7GoOPu87X0hhw
vSEo6xG98ITsLTPS/Eo98E5cKEpnKdf1t0FNR8e51t1IL2auB0644WZK60FH/CcB
CPyrQQARFo8aZUkpXXeVXZOYcBDNO1kfy3xw20Gk6qStW4hk3Fi5qNeF5/5A8r0/
Y/NnmQJS6KIMnOES3O0DNsFFA6SoVi7BCejfH0UslvAkNcAIY2XTN/h+abM+s7yM
MeMwu5hX98shHXsYs4DnnmRP9eQt1ZWAGad8XXqcxu3TK42Qw1KqwbmofB8T4RhL
FkWadgnJvRo=
=X8V3
-----END PGP SIGNATURE-----

--31zvzas5NXT9fief--