Check for valid destructor pointer before calling it.
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.
Signed-off-by Matt Helsley <matthltc-r/[email protected]>
--- kernel/deferqueue.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
kernel/deferqueue.c +2 -1
@@ -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]
Serge E. Hallyn
Acked-byQuoted 4 lines · Matt Helsley
Not every use of deferqueue will have a destructor function so we need to check it before calling it.
Signed-off-by Matt Helsley <matthltc-r/[email protected]>
Trivial enough
Quoted 26 lines
--- kernel/deferqueue.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)kernel/deferqueue.c +2
-1@@ -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
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.
Signed-off-by Matt Helsley <matthltc-r/[email protected]>--- kernel/deferqueue.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)kernel/deferqueue.c +2
-1@@ -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); }