[PATCH] VFS: Ensure that all the on-stack struct file_lock call fl_release_private (80fec4c6) · Commits · e / devices / android_kernel_teracube_emerald

fs/locks.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1548,6 +1548,8 @@ int fcntl_getlk(struct file filp, struct flock __user l)

		if (filp->f_op && filp->f_op->lock) {
		error = filp->f_op->lock(filp, F_GETLK, &file_lock);
		if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private)
		file_lock.fl_ops->fl_release_private(&file_lock);
		if (error < 0)
		goto out;
		else
		@@ -1690,6 +1692,8 @@ int fcntl_getlk64(struct file filp, struct flock64 __user l)

		if (filp->f_op && filp->f_op->lock) {
		error = filp->f_op->lock(filp, F_GETLK, &file_lock);
		if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private)
		file_lock.fl_ops->fl_release_private(&file_lock);
		if (error < 0)
		goto out;
		else
		@@ -1873,6 +1877,8 @@ void locks_remove_flock(struct file *filp)
		.fl_end = OFFSET_MAX,
		};
		filp->f_op->flock(filp, F_SETLKW, &fl);
		if (fl.fl_ops && fl.fl_ops->fl_release_private)
		fl.fl_ops->fl_release_private(&fl);
		}

		lock_kernel();