aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-02-20 19:59:25 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-02-20 19:59:25 +0000
commit8d7ca65dab585df56a8bbb69a48d42fb63104e1c (patch)
tree8102341d85c5682ec03c411c94c49f510a4025b3 /target/linux/generic/patches-2.6.36
parent94a22b91fc2acb3d28882c4660d0a7505a9b5d2e (diff)
downloadupstream-8d7ca65dab585df56a8bbb69a48d42fb63104e1c.tar.gz
upstream-8d7ca65dab585df56a8bbb69a48d42fb63104e1c.tar.bz2
upstream-8d7ca65dab585df56a8bbb69a48d42fb63104e1c.zip
add two solos-releated patches from Philip Prindeville
SVN-Revision: 25630
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.patch14
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));