Skip to contentSkip to conversation

w1: Use kfree_sensitive instead of memset+kfree

PATCH In review Alex Dewar 1 participant 2 messages Sep 9, 2020 W1 dallas's 1-wire bus

lore
Share & tools
lore

Alex Dewar

author
#0 lore raw

PATCH 1/2 w1: Use kfree_sensitive instead of memset+kfree

Issue identified with Coccinelle.

---
 drivers/w1/w1.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/w1/w1.c +1 -2
index e58c7592008d..4f597b0fd1da 100644
@@ -71,8 +71,7 @@ static void w1_master_release(struct device *dev)
 	struct w1_master *md = dev_to_w1_master(dev);
 
 	dev_dbg(dev, "%s: Releasing %s.\n", __func__, md->name);
-	memset(md, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));
-	kfree(md);
+	kfree_sensitive(md);
 }
 
 static void w1_slave_release(struct device *dev)
Signature · 1 line
2.28.0
author
#1 lore raw
Quoted 1 line · Alex Dewar

Issue identified with Coccinelle.

Hmm, on second thoughts, I'm not sure this memory is so sensitive after all. Should we just remove the call to memset?

Quoted 20 lines
---
  drivers/w1/w1.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/w1/w1.c +1 -2
index e58c7592008d..4f597b0fd1da 100644
@@ -71,8 +71,7 @@ static void w1_master_release(struct device *dev)
  	struct w1_master *md = dev_to_w1_master(dev);
 
  	dev_dbg(dev, "%s: Releasing %s.\n", __func__, md->name);
-	memset(md, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));
-	kfree(md);
+	kfree_sensitive(md);
  }
 
  static void w1_slave_release(struct device *dev)