瀏覽代碼

drivers/w1/w1_int.c: call put_device if device_register fails

Currently, memsetting and kfreeing the device is bad behaviour.  The
device will have a reference count of 1 and hence can cause trouble
because it has kfree'd.  Proper way to handle a failed device_register is
to call put_device right after it fails.

Signed-off-by: Levente Kurusa <levex@linux.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Levente Kurusa 10 年之前
父節點
當前提交
5052436dcb
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      drivers/w1/w1_int.c

+ 1 - 2
drivers/w1/w1_int.c

@@ -91,8 +91,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
 	err = device_register(&dev->dev);
 	err = device_register(&dev->dev);
 	if (err) {
 	if (err) {
 		pr_err("Failed to register master device. err=%d\n", err);
 		pr_err("Failed to register master device. err=%d\n", err);
-		memset(dev, 0, sizeof(struct w1_master));
-		kfree(dev);
+		put_device(&dev->dev);
 		dev = NULL;
 		dev = NULL;
 	}
 	}