← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to drivers/net/wireless/b43/dma.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-25.38
  • Date: 2013-02-20 22:03:31 UTC
  • mfrom: (74.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130220220331-0ea4l33x3cr61nch
Tags: 3.5.0-220.28
https://launchpad.net/bugs/1130311
https://launchpad.net/bugs/1129472
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
* Release Tracking Bug
  - LP: #1130311

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-25.38

[ Ubuntu: 3.5.0-25.38 ]

* Release Tracking Bug
  - LP: #1129472
* ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
  - LP: #1119885, #1129192
  - CVE-2013-0871
* ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL
  - LP: #1119885, #1129192
  - CVE-2013-0871
* wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED
  task
  - LP: #1119885, #1129192
  - CVE-2013-0871

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/b43/dma.c
409
409
                                struct b43_dmadesc_meta *meta)
410
410
{
411
411
        if (meta->skb) {
412
 
                dev_kfree_skb_any(meta->skb);
 
412
                if (ring->tx)
 
413
                        ieee80211_free_txskb(ring->dev->wl->hw, meta->skb);
 
414
                else
 
415
                        dev_kfree_skb_any(meta->skb);
413
416
                meta->skb = NULL;
414
417
        }
415
418
}
1454
1457
        if (unlikely(err == -ENOKEY)) {
1455
1458
                /* Drop this packet, as we don't have the encryption key
1456
1459
                 * anymore and must not transmit it unencrypted. */
1457
 
                dev_kfree_skb_any(skb);
 
1460
                ieee80211_free_txskb(dev->wl->hw, skb);
1458
1461
                err = 0;
1459
1462
                goto out;
1460
1463
        }