From 2a3356fbd9e653e3e9916e14321cdc74e234263a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 9 Oct 2007 13:40:45 -0700 Subject: [PATCH] nlm bugfix added --- ...fix-a-memory-leak-in-nlmsvc_testlock.patch | 37 +++++++++++++++++++ review-2.6.22/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 review-2.6.22/nlm-fix-a-memory-leak-in-nlmsvc_testlock.patch diff --git a/review-2.6.22/nlm-fix-a-memory-leak-in-nlmsvc_testlock.patch b/review-2.6.22/nlm-fix-a-memory-leak-in-nlmsvc_testlock.patch new file mode 100644 index 00000000000..c0041c1dc80 --- /dev/null +++ b/review-2.6.22/nlm-fix-a-memory-leak-in-nlmsvc_testlock.patch @@ -0,0 +1,37 @@ +From Trond.Myklebust@netapp.com Tue Oct 9 13:38:43 2007 +From: Trond Myklebust +Date: Tue, 9 Oct 2007 10:55:45 -0400 +Subject: NLM: Fix a memory leak in nlmsvc_testlock +Message-Id: <1191943677.8739.14.camel@heimdal.trondhjem.org> + +From: Trond Myklebust + +changeset a6d85430424d44e946e0946bfaad607115510989 in upstream + +The recent fix for a circular lock dependency unfortunately introduced a +potential memory leak in the event where the call to nlmsvc_lookup_host +fails for some reason. + +Thanks to Roel Kluin for spotting this. + +Signed-off-by: Trond Myklebust +Signed-off-by: Linus Torvalds +--- + + fs/lockd/svclock.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/fs/lockd/svclock.c ++++ b/fs/lockd/svclock.c +@@ -485,8 +485,10 @@ nlmsvc_testlock(struct svc_rqst *rqstp, + return nlm_granted; + /* Create host handle for callback */ + host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len); +- if (host == NULL) ++ if (host == NULL) { ++ kfree(conf); + return nlm_lck_denied_nolocks; ++ } + block = nlmsvc_create_block(rqstp, host, file, lock, cookie); + if (block == NULL) { + kfree(conf); diff --git a/review-2.6.22/series b/review-2.6.22/series index d193e210829..85f1d02a8bc 100644 --- a/review-2.6.22/series +++ b/review-2.6.22/series @@ -10,3 +10,4 @@ fix-smp-poweroff-hangs.patch fix-timer_stats-printout-of-events-sec.patch selinux-clear-parent-death-signal-on-sid-transitions.patch i386-use-global-flag-to-disable-broken-local-apic-timer-on-amd-cpus.patch +nlm-fix-a-memory-leak-in-nlmsvc_testlock.patch -- 2.47.3