diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-02-20 19:59:25 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-02-20 19:59:25 +0000 |
| commit | d4ce1edb5a60426afb62bfcc14313f33332bb07d (patch) | |
| tree | 19e63070e5c62cd2c6dd480811533e44d5b9021f /target/linux/generic/patches-2.6.36 | |
| parent | 7bfdfcc4bd109eb4c0837cf1ab3150d8f54730b6 (diff) | |
| download | master-187ad058-d4ce1edb5a60426afb62bfcc14313f33332bb07d.tar.gz master-187ad058-d4ce1edb5a60426afb62bfcc14313f33332bb07d.tar.bz2 master-187ad058-d4ce1edb5a60426afb62bfcc14313f33332bb07d.zip | |
[kernel] add two solos-releated patches from Philip Prindeville
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25630 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36')
| -rw-r--r-- | target/linux/generic/patches-2.6.36/280-solos_dont_null_deref.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.36/280-solos_dont_null_deref.patch b/target/linux/generic/patches-2.6.36/280-solos_dont_null_deref.patch new file mode 100644 index 0000000000..13595725ca --- /dev/null +++ b/target/linux/generic/patches-2.6.36/280-solos_dont_null_deref.patch @@ -0,0 +1,14 @@ +--- a/drivers/atm/solos-pci.c ++++ b/drivers/atm/solos-pci.c +@@ -866,8 +866,9 @@ static int popen(struct atm_vcc *vcc) + } + + skb = alloc_skb(sizeof(*header), GFP_ATOMIC); +- if (!skb && net_ratelimit()) { +- dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n"); ++ if (!skb) { ++ if (net_ratelimit()) ++ dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n"); + return -ENOMEM; + } + header = (void *)skb_put(skb, sizeof(*header)); |