[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1191942028.8739.3.camel@heimdal.trondhjem.org>
Date: Tue, 09 Oct 2007 11:00:28 -0400
From: Trond Myklebust <Trond.Myklebust@...app.com>
To: Roel Kluin <12o3l@...cali.nl>
Cc: Greg KH <gregkh@...e.de>, linux-kernel@...r.kernel.org,
stable@...nel.org, Justin Forbes <jmforbes@...uxtx.org>,
Zwane Mwaikambo <zwane@....linux.org.uk>,
"Theodore Ts'o" <tytso@....edu>,
Randy Dunlap <rdunlap@...otime.net>,
Dave Jones <davej@...hat.com>,
Chuck Wolber <chuckw@...ntumlinux.com>,
Chris Wedgwood <reviews@...cw.f00f.org>,
Michael Krufky <mkrufky@...uxtv.org>,
Chuck Ebbert <cebbert@...hat.com>,
Domenico Andreoli <cavokz@...il.com>,
torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
alan@...rguk.ukuu.org.uk
Subject: Re: [patch 08/12] NLM: Fix a circular lock dependency in lockd
On Mon, 2007-10-08 at 22:01 +0200, Roel Kluin wrote:
> Greg KH wrote:
>
> @@ -477,10 +479,15 @@ nlmsvc_testlock(struct svc_rqst *rqstp,
>
> if (block == NULL) {
> struct file_lock *conf = kzalloc(sizeof(*conf), GFP_KERNEL);
> + struct nlm_host *host;
>
> if (conf == NULL)
> return nlm_granted;
> - block = nlmsvc_create_block(rqstp, file, lock, cookie);
> + /* Create host handle for callback */
> + host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);
> + if (host == NULL)
> + return nlm_lck_denied_nolocks;
> + block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
> if (block == NULL) {
> kfree(conf);
> return nlm_granted;
>
> To be frankly I don't know what this is about, but shouldn't conf be freed if host == NULL?
Thanks for spotting this!
Greg, should I resend this patch, or would you prefer an incremental
fix?
Cheers
Trond
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists