Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks

Currently when the client creates a cifsFileInfo structure for
a newly opened file, it allocates a list of byte-range locks
with a pointer to the new cfile and attaches this list to the
inode's lock list. The latter happens before initializing all
other fields, e.g. cfile->tlink. Thus a partially initialized
cifsFileInfo structure becomes available to other threads that
walk through the inode's lock list. One example of such a thread
may be an oplock break worker thread that tries to push all
cached byte-range locks. This causes NULL-pointer dereference
in smb2_push_mandatory_locks() when accessing cfile->tlink:

[598428.945633] BUG: kernel NULL pointer dereference, address: 0000000000000038
...
[598428.945749] Workqueue: cifsoplockd cifs_oplock_break [cifs]
[598428.945793] RIP: 0010:smb2_push_mandatory_locks+0xd6/0x5a0 [cifs]
...
[598428.945834] Call Trace:
[598428.945870] ? cifs_revalidate_mapping+0x45/0x90 [cifs]
[598428.945901] cifs_oplock_break+0x13d/0x450 [cifs]
[598428.945909] process_one_work+0x1db/0x380
[598428.945914] worker_thread+0x4d/0x400
[598428.945921] kthread+0x104/0x140
[598428.945925] ? process_one_work+0x380/0x380
[598428.945931] ? kthread_park+0x80/0x80
[598428.945937] ret_from_fork+0x35/0x40

Fix this by reordering initialization steps of the cifsFileInfo
structure: initialize all the fields first and then add the new
byte-range lock list to the inode's lock list.

Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

authored by

Pavel Shilovsky and committed by
Steve French
6f582b27 21b26d26

+4 -3
+4 -3
fs/cifs/file.c
··· 315 315 INIT_LIST_HEAD(&fdlocks->locks); 316 316 fdlocks->cfile = cfile; 317 317 cfile->llist = fdlocks; 318 - cifs_down_write(&cinode->lock_sem); 319 - list_add(&fdlocks->llist, &cinode->llist); 320 - up_write(&cinode->lock_sem); 321 318 322 319 cfile->count = 1; 323 320 cfile->pid = current->tgid; ··· 338 341 cifs_dbg(FYI, "Reset oplock val from read to None due to mand locks\n"); 339 342 oplock = 0; 340 343 } 344 + 345 + cifs_down_write(&cinode->lock_sem); 346 + list_add(&fdlocks->llist, &cinode->llist); 347 + up_write(&cinode->lock_sem); 341 348 342 349 spin_lock(&tcon->open_file_lock); 343 350 if (fid->pending_open->oplock != CIFS_OPLOCK_NO_CHANGE && oplock)