nfsd: memory corruption in nfsd4_lock()
New struct nfsd4_blocked_lock allocated in find_or_allocate_block()
does not initialized nbl_list and nbl_lru.
If conflock allocation fails rollback can call list_del_init()
access uninitialized fields and corrupt memory.
v2: just initialize nbl_list and nbl_lru right after nbl allocation.
Fixes: 76d348fadf
("nfsd: have nfsd4_lock use blocking locks for v4.1+ lock")
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
parent
8f3d9f3542
commit
e1e8399eee
|
@ -267,6 +267,8 @@ find_or_allocate_block(struct nfs4_lockowner *lo, struct knfsd_fh *fh,
|
||||||
if (!nbl) {
|
if (!nbl) {
|
||||||
nbl= kmalloc(sizeof(*nbl), GFP_KERNEL);
|
nbl= kmalloc(sizeof(*nbl), GFP_KERNEL);
|
||||||
if (nbl) {
|
if (nbl) {
|
||||||
|
INIT_LIST_HEAD(&nbl->nbl_list);
|
||||||
|
INIT_LIST_HEAD(&nbl->nbl_lru);
|
||||||
fh_copy_shallow(&nbl->nbl_fh, fh);
|
fh_copy_shallow(&nbl->nbl_fh, fh);
|
||||||
locks_init_lock(&nbl->nbl_lock);
|
locks_init_lock(&nbl->nbl_lock);
|
||||||
nfsd4_init_cb(&nbl->nbl_cb, lo->lo_owner.so_client,
|
nfsd4_init_cb(&nbl->nbl_cb, lo->lo_owner.so_client,
|
||||||
|
|
Loading…
Reference in New Issue