diff --git a/iwlwifi-fix-freeing-uninitialized-pointer.patch b/iwlwifi-fix-freeing-uninitialized-pointer.patch deleted file mode 100644 index 90e6b6f64..000000000 --- a/iwlwifi-fix-freeing-uninitialized-pointer.patch +++ /dev/null @@ -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 ---- -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 \ No newline at end of file diff --git a/kernel.spec b/kernel.spec index 876b515c7..b5016e9a4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 11 +%define stable_update 12 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -765,12 +765,6 @@ Patch25007: fix-child-thread-introspection.patch #rhbz 844750 Patch25008: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.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 @@ -1494,12 +1488,6 @@ ApplyPatch fix-child-thread-introspection.patch ApplyPatch 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.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 @@ -2356,6 +2344,9 @@ fi # '-' | | # '-' %changelog +* Wed May 08 2013 Justin M. Forbes - 3.8.12-100 +- Linux v3.8.12 + * Tue May 07 2013 Josh Boyer - Fix dmesg_restrict patch to avoid regression (rhbz 952655) diff --git a/sources b/sources index b1f904923..e6f2a8e13 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 1c738edfc54e7c65faeb90c436104e2f linux-3.8.tar.xz -76ec67882ad94b8ab43c70a46befca13 patch-3.8.11.xz +f4995ab71e54e9770a4456fce64fb739 patch-3.8.12.xz diff --git a/wireless-regulatory-fix-channel-disabling-race-condition.patch b/wireless-regulatory-fix-channel-disabling-race-condition.patch deleted file mode 100644 index 313735377..000000000 --- a/wireless-regulatory-fix-channel-disabling-race-condition.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Johannes Berg - -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 ---- - 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 \ No newline at end of file