mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-26 16:09:23 -05:00
CVE Patches: ranged versions
This commit is contained in:
Tad
parent
f638b1434e
commit
7c31506e56
@ -628,6 +628,7 @@
|
||||
<option value='LA.BR.1.2.9_rb1.23'>LA.BR.1.2.9_rb1.23</option>
|
||||
<option value='LA.BR.1.2.9_rb1.24'>LA.BR.1.2.9_rb1.24</option>
|
||||
<option value='LA.BR.1.2.9_rb1.26'>LA.BR.1.2.9_rb1.26</option>
|
||||
<option value='LA.BR.1.2.9_rb1.27'>LA.BR.1.2.9_rb1.27</option>
|
||||
<option value='LA.BR.1.2.9_rb1.5'>LA.BR.1.2.9_rb1.5</option>
|
||||
<option value='LA.BR.1.2.9_rb1.6'>LA.BR.1.2.9_rb1.6</option>
|
||||
<option value='LA.BR.1.2.9_rb1.7'>LA.BR.1.2.9_rb1.7</option>
|
||||
@ -4107,6 +4108,7 @@
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-cros_ec'>caf/chromium-googlesource-kernel-next/chromeos-4.14-cros_ec</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-dm-verity'>caf/chromium-googlesource-kernel-next/chromeos-4.14-dm-verity</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-driver-core'>caf/chromium-googlesource-kernel-next/chromeos-4.14-driver-core</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-drm'>caf/chromium-googlesource-kernel-next/chromeos-4.14-drm</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-fs'>caf/chromium-googlesource-kernel-next/chromeos-4.14-fs</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-iio'>caf/chromium-googlesource-kernel-next/chromeos-4.14-iio</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-input'>caf/chromium-googlesource-kernel-next/chromeos-4.14-input</option>
|
||||
@ -4115,6 +4117,10 @@
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171026'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171026</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171027'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171027</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171030'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171030</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171031'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171031</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101-2'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101-2</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101-3'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101-3</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-normalize'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-normalize</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-misc'>caf/chromium-googlesource-kernel-next/chromeos-4.14-misc</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-mmc'>caf/chromium-googlesource-kernel-next/chromeos-4.14-mmc</option>
|
||||
|
||||
@ -628,6 +628,7 @@
|
||||
<option value='LA.BR.1.2.9_rb1.23'>LA.BR.1.2.9_rb1.23</option>
|
||||
<option value='LA.BR.1.2.9_rb1.24'>LA.BR.1.2.9_rb1.24</option>
|
||||
<option value='LA.BR.1.2.9_rb1.26'>LA.BR.1.2.9_rb1.26</option>
|
||||
<option value='LA.BR.1.2.9_rb1.27'>LA.BR.1.2.9_rb1.27</option>
|
||||
<option value='LA.BR.1.2.9_rb1.5'>LA.BR.1.2.9_rb1.5</option>
|
||||
<option value='LA.BR.1.2.9_rb1.6'>LA.BR.1.2.9_rb1.6</option>
|
||||
<option value='LA.BR.1.2.9_rb1.7'>LA.BR.1.2.9_rb1.7</option>
|
||||
@ -4107,6 +4108,7 @@
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-cros_ec'>caf/chromium-googlesource-kernel-next/chromeos-4.14-cros_ec</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-dm-verity'>caf/chromium-googlesource-kernel-next/chromeos-4.14-dm-verity</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-driver-core'>caf/chromium-googlesource-kernel-next/chromeos-4.14-driver-core</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-drm'>caf/chromium-googlesource-kernel-next/chromeos-4.14-drm</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-fs'>caf/chromium-googlesource-kernel-next/chromeos-4.14-fs</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-iio'>caf/chromium-googlesource-kernel-next/chromeos-4.14-iio</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-input'>caf/chromium-googlesource-kernel-next/chromeos-4.14-input</option>
|
||||
@ -4115,6 +4117,10 @@
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171026'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171026</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171027'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171027</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171030'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171030</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171031'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171031</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101-2'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101-2</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101-3'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-171101-3</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-normalize'>caf/chromium-googlesource-kernel-next/chromeos-4.14-merge-normalize</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-misc'>caf/chromium-googlesource-kernel-next/chromeos-4.14-misc</option>
|
||||
<option value='caf/chromium-googlesource-kernel-next/chromeos-4.14-mmc'>caf/chromium-googlesource-kernel-next/chromeos-4.14-mmc</option>
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
From 6bd7e74005e90ef79402a9c94e1044f845aa49f1 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Tue, 5 Sep 2017 14:54:54 +0200
|
||||
Subject: [PATCH] mac80211: accept key reinstall without changing anything
|
||||
|
||||
When a key is reinstalled we can reset the replay counters
|
||||
etc. which can lead to nonce reuse and/or replay detection
|
||||
being impossible, breaking security properties, as described
|
||||
in the "KRACK attacks".
|
||||
|
||||
In particular, CVE-2017-13080 applies to GTK rekeying that
|
||||
happened in firmware while the host is in D3, with the second
|
||||
part of the attack being done after the host wakes up. In
|
||||
this case, the wpa_supplicant mitigation isn't sufficient
|
||||
since wpa_supplicant doesn't know the GTK material.
|
||||
|
||||
In case this happens, simply silently accept the new key
|
||||
coming from userspace but don't take any action on it since
|
||||
it's the same key; this keeps the PN replay counters intact.
|
||||
|
||||
Change-Id: If973789c12d2afcd9192f796e27bc9598c5dd1c0
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
---
|
||||
net/mac80211/key.c | 20 +++++++++++++++++---
|
||||
1 file changed, 17 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
|
||||
index 5bb600d93d7..cebe30315d9 100644
|
||||
--- a/net/mac80211/key.c
|
||||
+++ b/net/mac80211/key.c
|
||||
@@ -3,6 +3,7 @@
|
||||
* Copyright 2005-2006, Devicescape Software, Inc.
|
||||
* Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
|
||||
* Copyright 2007-2008 Johannes Berg <johannes@sipsolutions.net>
|
||||
+ * Copyright 2015-2017 Intel Deutschland GmbH
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
@@ -452,9 +453,6 @@ int ieee80211_key_link(struct ieee80211_key *key,
|
||||
|
||||
pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
|
||||
idx = key->conf.keyidx;
|
||||
- key->local = sdata->local;
|
||||
- key->sdata = sdata;
|
||||
- key->sta = sta;
|
||||
|
||||
if (sta) {
|
||||
/*
|
||||
@@ -491,6 +489,21 @@ int ieee80211_key_link(struct ieee80211_key *key,
|
||||
else
|
||||
old_key = key_mtx_dereference(sdata->local, sdata->keys[idx]);
|
||||
|
||||
+ /*
|
||||
+ * Silently accept key re-installation without really installing the
|
||||
+ * new version of the key to avoid nonce reuse or replay issues.
|
||||
+ */
|
||||
+ if (old_key && key->conf.keylen == old_key->conf.keylen &&
|
||||
+ !memcmp(key->conf.key, old_key->conf.key, key->conf.keylen)) {
|
||||
+ ieee80211_key_free_unused(key);
|
||||
+ ret = 0;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ key->local = sdata->local;
|
||||
+ key->sdata = sdata;
|
||||
+ key->sta = sta;
|
||||
+
|
||||
increment_tailroom_need_count(sdata);
|
||||
|
||||
__ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
|
||||
@@ -500,6 +513,7 @@ int ieee80211_key_link(struct ieee80211_key *key,
|
||||
|
||||
ret = ieee80211_key_enable_hw_accel(key);
|
||||
|
||||
+ out:
|
||||
mutex_unlock(&sdata->local->key_mtx);
|
||||
|
||||
return ret;
|
||||
@ -48,7 +48,7 @@ Acked-by: Douglas Gilbert <dgilbert@interlog.com>
|
||||
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
||||
</div><div class='diffstat-header'><a href='/pub/scm/linux/kernel/git/torvalds/linux.git/diff/?id=bf33f87dd04c371ea33feb821b60d63d754e3124'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/pub/scm/linux/kernel/git/torvalds/linux.git/diff/drivers/scsi/sg.c?id=bf33f87dd04c371ea33feb821b60d63d754e3124'>drivers/scsi/sg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='2%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
|
||||
</table><div class='diffstat-summary'>1 files changed, 2 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c<br/>index e831e01..849ff810 100644<br/>--- a/<a href='/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/sg.c?id=645b8ef5943f95b74240568105ce2be21c6640b4'>drivers/scsi/sg.c</a><br/>+++ b/<a href='/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/sg.c?id=bf33f87dd04c371ea33feb821b60d63d754e3124'>drivers/scsi/sg.c</a></div><div class='hunk'>@@ -996,6 +996,8 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)</div><div class='ctx'> result = get_user(val, ip);</div><div class='ctx'> if (result)</div><div class='ctx'> return result;</div><div class='add'>+ if (val > SG_MAX_CDB_SIZE)</div><div class='add'>+ return -ENOMEM;</div><div class='ctx'> sfp->next_cmd_len = (val > 0) ? val : 0;</div><div class='ctx'> return 0;</div><div class='ctx'> case SG_GET_VERSION_NUM:</div></td></tr></table></div> <!-- class=content -->
|
||||
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.1</a> at 2017-10-31 17:14:35 +0000</div>
|
||||
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.1</a> at 2017-11-02 19:04:29 +0000</div>
|
||||
</div> <!-- id=cgit -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -246,7 +246,7 @@ patch -p1 < $patches"android_kernel_motorola_msm8916/0001-Overclock.patch" #1.36
|
||||
#Make changes to all devices
|
||||
cd $base
|
||||
find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enhanceLocation "$0"' {} \;
|
||||
find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enabledForcedEncryption "$0"' {} \;
|
||||
#find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enabledForcedEncryption "$0"' {} \;
|
||||
cd $base
|
||||
#
|
||||
#END OF DEVICE CHANGES
|
||||
|
||||
Loading…
Reference in New Issue
Block a user