| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1430873070-7290-13-git-send-email-mcgrof@do-not-panic.com>
Date: Tue, 5 May 2015 17:44:30 -0700
From: "Luis R. Rodriguez" <mcgrof@...not-panic.com>
To: rusty@...tcorp.com.au, dhowells@...hat.com, ming.lei@...onical.com,
seth.forshee@...onical.com, kyle@...nel.org
Cc: akpm@...ux-foundation.org, gregkh@...uxfoundation.org,
keescook@...omium.org, casey@...aufler-ca.com, tiwai@...e.de,
mjg59@...f.ucam.org, wireless-regdb@...ts.infradead.org,
linux-wireless@...r.kernel.org, jlee@...e.com,
linux-kernel@...r.kernel.org, "Luis R. Rodriguez" <mcgrof@...e.com>
Subject: [RFC v1 12/12] cfg80211: request for regulatory system data file
From: "Luis R. Rodriguez" <mcgrof@...e.com>
With sysdata_file_request_*() helpers in places we
don't need CRDA anymore, we can just request for the
regulatory file we need from within the kernel with
the kernel's configuration preferences for
cryptographic requirements.
-- this patch is incomplete still, it doesn't have
any optional key preferences yet. This needs
discussion.
Signed-off-by: Luis R. Rodriguez <mcgrof@...e.com>
---
net/wireless/Kconfig | 20 +++++++++++++
net/wireless/reg.c | 85 ++++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 89 insertions(+), 16 deletions(-)
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 29c8675..1610d30 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -152,6 +152,26 @@ config CFG80211_DEBUGFS
If unsure, say N.
+config CFG80211_REGDB_SYSDATA
+ default y
+ bool "Request binary regulatory database from userspace"
+ depends on CFG80211
+ ---help---
+ This allows cfg80211 to look for updates to the regulatory
+ database from /lib/firmware/ without needing a userspace
+ agent such as CRDA.
+
+ You should say y.
+
+config CFG80211_REGDB_SYSDATA_SIGNED
+ default y
+ bool "Require the regulatory database to be digitally signed"
+ depends on CFG80211 && CFG80211_REGDB_SYSDATA
+ ---help---
+ This makes cfg80211 only trust signed regulatory database files.
+
+ You should say y.
+
config CFG80211_INTERNAL_REGDB
bool "use statically compiled regulatory rules database" if EXPERT
default n
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 48dfc7b..70a1be8 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1,21 +1,39 @@
/*
- * Copyright 2002-2005, Instant802 Networks, Inc.
- * Copyright 2005-2006, Devicescape Software, Inc.
- * Copyright 2007 Johannes Berg <johannes@...solutions.net>
- * Copyright 2008-2011 Luis R. Rodriguez <mcgrof@....qualcomm.com>
- * Copyright 2013-2014 Intel Mobile Communications GmbH
+ * Linux 802.11 regulatory
*
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Copyright 2015 Luis R. Rodriguez <mcgrof@...not-panic.com>
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, see
+ * http://www.gnu.org/licenses/.
+ *
+ * This file was previously licensed under the following license:
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005-2006, Devicescape Software, Inc.
+ * Copyright 2007 Johannes Berg <johannes@...solutions.net>
+ * Copyright 2008-2011 Luis R. Rodriguez <mcgrof@...not-panic.com>
+ * Copyright 2013-2014 Intel Mobile Communications GmbH
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
@@ -53,6 +71,7 @@
#include <linux/nl80211.h>
#include <linux/platform_device.h>
#include <linux/moduleparam.h>
+#include <linux/sysdata.h>
#include <net/cfg80211.h>
#include "core.h"
#include "reg.h"
@@ -73,6 +92,8 @@
*/
#define REG_ENFORCE_GRACE_MS 60000
+const struct sysdata_file *regulatory_sysdata;
+
/**
* enum reg_request_treatment - regulatory request treatment
*
@@ -3079,9 +3100,33 @@ bool regulatory_indoor_allowed(void)
return reg_is_indoor;
}
+static void reg_sysdata_complete(const struct sysdata_file *sysdata,
+ void *context)
+{
+ const char *reason = context;
+
+ pr_info("Processing regulatory data request from: %s", reason);
+
+ if (!sysdata) {
+ pr_info("no new regulatory data not available\n");
+ return;
+ }
+
+ if (sysdata->data) {
+ pr_info("XXX: sysdata for reguatory present: size: %d\n",
+ (int) sysdata->size);
+ } else
+ pr_info("XXX: sysdata not present :(\n");
+
+ regulatory_sysdata = sysdata;
+}
+
int __init regulatory_init(void)
{
int err = 0;
+ const struct sysdata_file_desc sysdata_desc = {
+ SYSDATA_DEFAULT_ASYNC(reg_sysdata_complete, "initial boot"),
+ };
reg_pdev = platform_device_register_simple("regulatory", 0, NULL, 0);
if (IS_ERR(reg_pdev))
@@ -3120,7 +3165,13 @@ int __init regulatory_init(void)
regulatory_hint_user(ieee80211_regdom,
NL80211_USER_REG_HINT_USER);
- return 0;
+ err = sysdata_file_request_async("regulatory.bin",
+ &sysdata_desc,
+ ®_pdev->dev);
+ if (err)
+ platform_device_unregister(reg_pdev);
+
+ return err;
}
void regulatory_exit(void)
@@ -3155,4 +3206,6 @@ void regulatory_exit(void)
list_del(®_request->list);
kfree(reg_request);
}
+
+ release_sysdata_file(regulatory_sysdata);
}
--
2.3.2.209.gd67f9d5.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists