add two solos-releated patches from Philip Prindeville

SVN-Revision: 25630
2011-02-20 19:59:25 +00:00
parent 94a22b91fc
commit 8d7ca65dab
6 changed files with 75 additions and 3 deletions
--- 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
@@ -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));