Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit a6d85430424d44e946e0946bfaad607115510989

Authored by Trond Myklebust
Committed by Linus Torvalds
1 parent baf14aa14e
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

NLM: Fix a memory leak in nlmsvc_testlock 

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 <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

... ... @@ -485,8 +485,10 @@
485 485 return nlm_granted;
486 486 /* Create host handle for callback */
487 487 host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);
488   - if (host == NULL)
  488 + if (host == NULL) {
  489 + kfree(conf);
489 490 return nlm_lck_denied_nolocks;
  491 + }
490 492 block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
491 493 if (block == NULL) {
492 494 kfree(conf);