3.9.1-rc1
This commit is contained in:
Dave Jones
parent
f10fcf750f
commit
06b327f4ff
|
|
@ -1,51 +0,0 @@
|
|||
If on iwl_dump_nic_event_log() error occurs before that function
|
||||
initialize buf, we process uninitiated pointer in
|
||||
iwl_dbgfs_log_event_read() and can hit "BUG at mm/slub.c:3409"
|
||||
|
||||
Resolves:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=951241
|
||||
|
||||
Reported-by: ian.odette@eprize.com
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
Patch is only compile tested, but I'm sure it fixes the problem.
|
||||
|
||||
drivers/net/wireless/iwlwifi/dvm/debugfs.c | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
|
||||
index 7b8178b..cb6dd58 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
|
||||
@@ -2237,15 +2237,15 @@ static ssize_t iwl_dbgfs_log_event_read(struct file *file,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct iwl_priv *priv = file->private_data;
|
||||
- char *buf;
|
||||
- int pos = 0;
|
||||
- ssize_t ret = -ENOMEM;
|
||||
+ char *buf = NULL;
|
||||
+ ssize_t ret;
|
||||
|
||||
- ret = pos = iwl_dump_nic_event_log(priv, true, &buf, true);
|
||||
- if (buf) {
|
||||
- ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
|
||||
- kfree(buf);
|
||||
- }
|
||||
+ ret = iwl_dump_nic_event_log(priv, true, &buf, true);
|
||||
+ if (ret < 0)
|
||||
+ goto err;
|
||||
+ ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
|
||||
+err:
|
||||
+ kfree(buf);
|
||||
return ret;
|
||||
}
|
||||
|
||||
--
|
||||
1.7.11.7
|
||||
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
21
kernel.spec
21
kernel.spec
|
|
@ -74,9 +74,9 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 0
|
||||
%define stable_update 1
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
%define stable_rc 1
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
|
@ -748,12 +748,6 @@ Patch25001: i7300_edac_single_mode_fixup.patch
|
|||
#rhbz 927469
|
||||
Patch25007: fix-child-thread-introspection.patch
|
||||
|
||||
#rhbz 919176
|
||||
Patch25010: wireless-regulatory-fix-channel-disabling-race-condition.patch
|
||||
|
||||
#rhbz 951241
|
||||
Patch25011: iwlwifi-fix-freeing-uninitialized-pointer.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -1445,12 +1439,6 @@ ApplyPatch VMX-x86-handle-host-TSC-calibration-failure.patch
|
|||
#rhbz 927469
|
||||
ApplyPatch fix-child-thread-introspection.patch
|
||||
|
||||
#rhbz 919176
|
||||
ApplyPatch wireless-regulatory-fix-channel-disabling-race-condition.patch
|
||||
|
||||
#rhbz 951241
|
||||
ApplyPatch iwlwifi-fix-freeing-uninitialized-pointer.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -2305,6 +2293,11 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Mon May 06 2013 Dave Jones <davej@redhat.com> - 3.9.1-0.rc1.200
|
||||
- Linux 3.9.1-rc1
|
||||
merged: wireless-regulatory-fix-channel-disabling-race-condition.patch
|
||||
merged: iwlwifi-fix-freeing-uninitialized-pointer.patch
|
||||
|
||||
* Mon May 06 2013 Josh Boyer <jwboyer@redhat.com>
|
||||
- Rebase F18 secure-boot patchset to Linux v3.9
|
||||
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
|
||||
When a full scan 2.4 and 5 GHz scan is scheduled, but then the 2.4 GHz
|
||||
part of the scan disables a 5.2 GHz channel due to, e.g. receiving
|
||||
country or frequency information, that 5.2 GHz channel might already
|
||||
be in the list of channels to scan next. Then, when the driver checks
|
||||
if it should do a passive scan, that will return false and attempt an
|
||||
active scan. This is not only wrong but can also lead to the iwlwifi
|
||||
device firmware crashing since it checks regulatory as well.
|
||||
|
||||
Fix this by not setting the channel flags to just disabled but rather
|
||||
OR'ing in the disabled flag. That way, even if the race happens, the
|
||||
channel will be scanned passively which is still (mostly) correct.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
---
|
||||
net/wireless/reg.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
|
||||
index 93ab840..507c28e 100644
|
||||
--- a/net/wireless/reg.c
|
||||
+++ b/net/wireless/reg.c
|
||||
@@ -855,7 +855,7 @@ static void handle_channel(struct wiphy *wiphy,
|
||||
return;
|
||||
|
||||
REG_DBG_PRINT("Disabling freq %d MHz\n", chan->center_freq);
|
||||
- chan->flags = IEEE80211_CHAN_DISABLED;
|
||||
+ chan->flags |= IEEE80211_CHAN_DISABLED;
|
||||
return;
|
||||
}
|
||||
|
||||
--
|
||||
1.8.0
|
||||
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
Loading…
Reference in New Issue