Commit f20ae9cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'filelock-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux 

Pull file locking updates from Jeff Layton:

 - new functionality for F_OFD_GETLK: requesting a type of F_UNLCK will
   find info about whatever lock happens to be first in the given range,
   regardless of type.

 - an OFD lock selftest

 - bugfix involving a UAF in a tracepoint

 - comment typo fix

* tag 'filelock-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: fix KASAN: use-after-free in trace_event_raw_event_filelock_lock
  fs/locks: Fix typo
  selftests: add OFD lock tests
  fs/locks: F_UNLCK extension for F_OFD_GETLK
parents b4a04f92 74f6f591

fs/locks.c

+22 −5
Original line number Diff line number Diff line
@@ -868,6 +868,21 @@ static bool posix_locks_conflict(struct file_lock *caller_fl, 
	return locks_conflict(caller_fl, sys_fl);

}



/* Determine if lock sys_fl blocks lock caller_fl. Used on xx_GETLK

 * path so checks for additional GETLK-specific things like F_UNLCK.

 */

static bool posix_test_locks_conflict(struct file_lock *caller_fl,

				      struct file_lock *sys_fl)

{

	/* F_UNLCK checks any locks on the same fd. */

	if (caller_fl->fl_type == F_UNLCK) {

		if (!posix_same_owner(caller_fl, sys_fl))

			return false;

		return locks_overlap(caller_fl, sys_fl);

	}

	return posix_locks_conflict(caller_fl, sys_fl);

}



/* Determine if lock sys_fl blocks lock caller_fl. FLOCK specific

 * checking before calling the locks_conflict().

 */
@@ -901,7 +916,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl) 
retry:

	spin_lock(&ctx->flc_lock);

	list_for_each_entry(cfl, &ctx->flc_posix, fl_list) {

		if (!posix_locks_conflict(fl, cfl))

		if (!posix_test_locks_conflict(fl, cfl))

			continue;

		if (cfl->fl_lmops && cfl->fl_lmops->lm_lock_expirable

			&& (*cfl->fl_lmops->lm_lock_expirable)(cfl)) {
@@ -1301,6 +1316,7 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request, 
 out:

	spin_unlock(&ctx->flc_lock);

	percpu_up_read(&file_rwsem);

	trace_posix_lock_inode(inode, request, error);

	/*

	 * Free any unused locks.

	 */
@@ -1309,7 +1325,6 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request, 
	if (new_fl2)

		locks_free_lock(new_fl2);

	locks_dispose_list(&dispose);

	trace_posix_lock_inode(inode, request, error);



	return error;

}
@@ -2136,7 +2151,7 @@ EXPORT_SYMBOL_GPL(vfs_test_lock); 
 * @fl: The file_lock who's fl_pid should be translated

 * @ns: The namespace into which the pid should be translated

 *

 * Used to tranlate a fl_pid into a namespace virtual pid number

 * Used to translate a fl_pid into a namespace virtual pid number

 */

static pid_t locks_translate_pid(struct file_lock *fl, struct pid_namespace *ns)

{
@@ -2207,7 +2222,8 @@ int fcntl_getlk(struct file *filp, unsigned int cmd, struct flock *flock) 
	if (fl == NULL)

		return -ENOMEM;

	error = -EINVAL;

	if (flock->l_type != F_RDLCK && flock->l_type != F_WRLCK)

	if (cmd != F_OFD_GETLK && flock->l_type != F_RDLCK

			&& flock->l_type != F_WRLCK)

		goto out;



	error = flock_to_posix_lock(filp, fl, flock);
@@ -2414,7 +2430,8 @@ int fcntl_getlk64(struct file *filp, unsigned int cmd, struct flock64 *flock) 
		return -ENOMEM;



	error = -EINVAL;

	if (flock->l_type != F_RDLCK && flock->l_type != F_WRLCK)

	if (cmd != F_OFD_GETLK && flock->l_type != F_RDLCK

			&& flock->l_type != F_WRLCK)

		goto out;



	error = flock64_to_posix_lock(filp, fl, flock);

tools/testing/selftests/filelock/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



TEST_GEN_PROGS := ofdlocks



include ../lib.mk

tools/testing/selftests/filelock/ofdlocks.c

0 → 100644
+132 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#define _GNU_SOURCE

#include <fcntl.h>

#include <assert.h>

#include <stdio.h>

#include <unistd.h>

#include <string.h>

#include "../kselftest.h"



static int lock_set(int fd, struct flock *fl)

{

	int ret;



	fl->l_pid = 0;		// needed for OFD locks

	fl->l_whence = SEEK_SET;

	ret = fcntl(fd, F_OFD_SETLK, fl);

	if (ret)

		perror("fcntl()");

	return ret;

}



static int lock_get(int fd, struct flock *fl)

{

	int ret;



	fl->l_pid = 0;		// needed for OFD locks

	fl->l_whence = SEEK_SET;

	ret = fcntl(fd, F_OFD_GETLK, fl);

	if (ret)

		perror("fcntl()");

	return ret;

}



int main(void)

{

	int rc;

	struct flock fl, fl2;

	int fd = open("/tmp/aa", O_RDWR | O_CREAT | O_EXCL, 0600);

	int fd2 = open("/tmp/aa", O_RDONLY);



	unlink("/tmp/aa");

	assert(fd != -1);

	assert(fd2 != -1);

	ksft_print_msg("[INFO] opened fds %i %i\n", fd, fd2);



	/* Set some read lock */

	fl.l_type = F_RDLCK;

	fl.l_start = 5;

	fl.l_len = 3;

	rc = lock_set(fd, &fl);

	if (rc == 0) {

		ksft_print_msg

		    ("[SUCCESS] set OFD read lock on first fd\n");

	} else {

		ksft_print_msg("[FAIL] to set OFD read lock on first fd\n");

		return -1;

	}

	/* Make sure read locks do not conflict on different fds. */

	fl.l_type = F_RDLCK;

	fl.l_start = 5;

	fl.l_len = 1;

	rc = lock_get(fd2, &fl);

	if (rc != 0)

		return -1;

	if (fl.l_type != F_UNLCK) {

		ksft_print_msg("[FAIL] read locks conflicted\n");

		return -1;

	}

	/* Make sure read/write locks do conflict on different fds. */

	fl.l_type = F_WRLCK;

	fl.l_start = 5;

	fl.l_len = 1;

	rc = lock_get(fd2, &fl);

	if (rc != 0)

		return -1;

	if (fl.l_type != F_UNLCK) {

		ksft_print_msg

		    ("[SUCCESS] read and write locks conflicted\n");

	} else {

		ksft_print_msg

		    ("[SUCCESS] read and write locks not conflicted\n");

		return -1;

	}

	/* Get info about the lock on first fd. */

	fl.l_type = F_UNLCK;

	fl.l_start = 5;

	fl.l_len = 1;

	rc = lock_get(fd, &fl);

	if (rc != 0) {

		ksft_print_msg

		    ("[FAIL] F_OFD_GETLK with F_UNLCK not supported\n");

		return -1;

	}

	if (fl.l_type != F_UNLCK) {

		ksft_print_msg

		    ("[SUCCESS] F_UNLCK test returns: locked, type %i pid %i len %zi\n",

		     fl.l_type, fl.l_pid, fl.l_len);

	} else {

		ksft_print_msg

		    ("[FAIL] F_OFD_GETLK with F_UNLCK did not return lock info\n");

		return -1;

	}

	/* Try the same but by locking everything by len==0. */

	fl2.l_type = F_UNLCK;

	fl2.l_start = 0;

	fl2.l_len = 0;

	rc = lock_get(fd, &fl2);

	if (rc != 0) {

		ksft_print_msg

		    ("[FAIL] F_OFD_GETLK with F_UNLCK not supported\n");

		return -1;

	}

	if (memcmp(&fl, &fl2, sizeof(fl))) {

		ksft_print_msg

		    ("[FAIL] F_UNLCK test returns: locked, type %i pid %i len %zi\n",

		     fl.l_type, fl.l_pid, fl.l_len);

		return -1;

	}

	ksft_print_msg("[SUCCESS] F_UNLCK with len==0 returned the same\n");

	/* Get info about the lock on second fd - no locks on it. */

	fl.l_type = F_UNLCK;

	fl.l_start = 0;

	fl.l_len = 0;

	lock_get(fd2, &fl);

	if (fl.l_type != F_UNLCK) {

		ksft_print_msg

		    ("[FAIL] F_OFD_GETLK with F_UNLCK return lock info from another fd\n");

		return -1;

	}

	return 0;

}