Skip to contentSkip to conversation

Check for valid destructor pointer before calling it.

PATCH In review Matt Helsley 3 participants 3 messages Sep 28, 2009 – Sep 29, 2009 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Check for valid destructor pointer before calling it.

Not every use of deferqueue will have a destructor function so we need to check it before calling it.

---
 kernel/deferqueue.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
kernel/deferqueue.c +2 -1
index 3fb388b..1204c8b 100644
@@ -53,7 +53,8 @@ void deferqueue_destroy(struct deferqueue_head *h)
 
 		pr_debug("%s: freeing non-empty queue\n", __func__);
 		list_for_each_entry_safe(dq, n, &h->list, list) {
-			dq->destructor(dq->data);
+			if (dq->destructor)
+				dq->destructor(dq->data);
 			list_del(&dq->list);
 			kfree(dq);
 		}
Signature · 1 line
1.5.6.3

A message that is not in the archive (sent off-list or not yet received): 1254164482-2193-1-git-send-email-matthltc-r/[email protected]

#2 lore raw
Quoted 4 lines · Matt Helsley

Not every use of deferqueue will have a destructor function so we need to check it before calling it.

Trivial enough

Quoted 26 lines
---
 kernel/deferqueue.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
kernel/deferqueue.c +2 -1
index 3fb388b..1204c8b 100644
@@ -53,7 +53,8 @@ void deferqueue_destroy(struct deferqueue_head *h)
 
 		pr_debug("%s: freeing non-empty queue\n", __func__);
 		list_for_each_entry_safe(dq, n, &h->list, list) {
-			dq->destructor(dq->data);
+			if (dq->destructor)
+				dq->destructor(dq->data);
 			list_del(&dq->list);
 			kfree(dq);
 		}
Signature · 7 lines
1.5.6.3


_______________________________________________
Containers mailing list
Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
https://lists.linux-foundation.org/mailman/listinfo/containers
#3 lore raw
In reply to a message not in the archive

Queued for ckpt-v18-dev.

Quoted 22 lines · Matt Helsley

Not every use of deferqueue will have a destructor function so we need to check it before calling it.

---
 kernel/deferqueue.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
kernel/deferqueue.c +2 -1
index 3fb388b..1204c8b 100644
@@ -53,7 +53,8 @@ void deferqueue_destroy(struct deferqueue_head *h)
 
 		pr_debug("%s: freeing non-empty queue\n", __func__);
 		list_for_each_entry_safe(dq, n, &h->list, list) {
-			dq->destructor(dq->data);
+			if (dq->destructor)
+				dq->destructor(dq->data);
 			list_del(&dq->list);
 			kfree(dq);
 		}