commit 22ddf44d54d0b2326f7b233e836e7155d45d3a7d Author: Chris Wright Date: Wed May 10 18:56:24 2006 -0700 Linux 2.6.16.16 commit 1f0e637c94a9b041833947c79110d6c02fff8618 Author: Trond Myklebust Date: Sun May 7 23:02:42 2006 -0400 [PATCH] fs/locks.c: Fix lease_init (CVE-2006-1860) It is insane to be giving lease_init() the task of freeing the lock it is supposed to initialise, given that the lock is not guaranteed to be allocated on the stack. This causes lockups in fcntl_setlease(). Problem diagnosed by Daniel Hokka Zakrisson Also fix a slab leak in __setlease() due to an uninitialised return value. Problem diagnosed by Björn Steinbrink. Signed-off-by: Trond Myklebust Tested-by: Daniel Hokka Zakrisson Signed-off-by: Linus Torvalds Cc: Björn Steinbrink Signed-off-by: Chris Wright