tracing: Fix null pointer deref with SEND_SIG_FORCED

[safe/jmp/linux-2.6] / net / atm / atm_sysfs.c

diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c
index 1b88311..799c631 100644 (file)
--- a/net/atm/atm_sysfs.c
+++ b/net/atm/atm_sysfs.c
@@ -1,6 +1,7 @@
 /* ATM driver model support. */
 
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/kobject.h>
 #include <linux/atmdev.h>
@@ -42,13 +43,14 @@ static ssize_t show_atmaddress(struct device *cdev,
 
        spin_lock_irqsave(&adev->lock, flags);
        list_for_each_entry(aaddr, &adev->local, entry) {
-               for(i = 0, j = 0; i < ATM_ESA_LEN; ++i, ++j) {
+               for (i = 0, j = 0; i < ATM_ESA_LEN; ++i, ++j) {
                        if (j == *fmt) {
                                pos += sprintf(pos, ".");
                                ++fmt;
                                j = 0;
                        }
-                       pos += sprintf(pos, "%02x", aaddr->addr.sas_addr.prv[i]);
+                       pos += sprintf(pos, "%02x",
+                                      aaddr->addr.sas_addr.prv[i]);
                }
                pos += sprintf(pos, "\n");
        }
@@ -78,17 +80,17 @@ static ssize_t show_link_rate(struct device *cdev,
 
        /* show the link rate, not the data rate */
        switch (adev->link_rate) {
-               case ATM_OC3_PCR:
-                       link_rate = 155520000;
-                       break;
-               case ATM_OC12_PCR:
-                       link_rate = 622080000;
-                       break;
-               case ATM_25_PCR:
-                       link_rate = 25600000;
-                       break;
-               default:
-                       link_rate = adev->link_rate * 8 * 53;
+       case ATM_OC3_PCR:
+               link_rate = 155520000;
+               break;
+       case ATM_OC12_PCR:
+               link_rate = 622080000;
+               break;
+       case ATM_25_PCR:
+               link_rate = 25600000;
+               break;
+       default:
+               link_rate = adev->link_rate * 8 * 53;
        }
        pos += sprintf(pos, "%d\n", link_rate);
 
@@ -149,7 +151,7 @@ int atm_register_sysfs(struct atm_dev *adev)
        cdev->class = &atm_class;
        dev_set_drvdata(cdev, adev);
 
-       snprintf(cdev->bus_id, BUS_ID_SIZE, "%s%d", adev->type, adev->number);
+       dev_set_name(cdev, "%s%d", adev->type, adev->number);
        err = device_register(cdev);
        if (err < 0)
                return err;