From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oren Laadan Subject: Re: [PATCH 1/2] Check for valid destructor pointer before calling it. Date: Tue, 29 Sep 2009 19:34:04 -0400 Message-ID: <4AC2996C.1050802@librato.com> References: <1254164482-2193-1-git-send-email-matthltc@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1254164482-2193-1-git-send-email-matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Matt Helsley Cc: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org List-Id: containers.vger.kernel.org Queued for ckpt-v18-dev. Matt Helsley wrote: > Not every use of deferqueue will have a destructor function so > we need to check it before calling it. > > Signed-off-by: Matt Helsley > --- > kernel/deferqueue.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/kernel/deferqueue.c b/kernel/deferqueue.c > index 3fb388b..1204c8b 100644 > --- a/kernel/deferqueue.c > +++ b/kernel/deferqueue.c > @@ -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); > }