Attachment 314636 Details for Bug 456282 – Patch to check for fcntl/close race and clean up POSIX locks

[patch] Patch to check for fcntl/close race and clean up POSIX locks

l_r_f-el4.patch (text/plain), 1.22 KB, created by Bryn M. Reeves on 2008-08-20 16:27:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2008-08-20 16:27:17 UTC

Size: 1.22 KB

patch

obsolete

>diff -up linux-2.6.9/fs/fcntl.c.locks_remove_flock linux-2.6.9/fs/fcntl.c
>--- linux-2.6.9/fs/fcntl.c.locks_remove_flock	2008-08-20 16:28:22.000000000 +0100
>+++ linux-2.6.9/fs/fcntl.c	2008-08-20 17:20:41.000000000 +0100
>@@ -364,7 +364,7 @@ static long do_fcntl(int fd, unsigned in
> 
> asmlinkage long sys_fcntl(int fd, unsigned int cmd, unsigned long arg)
> {	
>-	struct file *filp;
>+	struct file *filp, *f;
> 	long err = -EBADF;
> 
> 	filp = fget(fd);
>@@ -379,6 +379,10 @@ asmlinkage long sys_fcntl(int fd, unsign
> 
> 	err = do_fcntl(fd, cmd, arg, filp);
> 
>+	/* clean up posix locks established after the file was closed */
>+	f = fcheck(fd);
>+	if (f != filp)
>+		locks_remove_posix(filp, current->files);
>  	fput(filp);
> out:
> 	return err;
>@@ -387,7 +391,7 @@ out:
> #if BITS_PER_LONG == 32
> asmlinkage long sys_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg)
> {	
>-	struct file * filp;
>+	struct file *filp, *f;
> 	long err;
> 
> 	err = -EBADF;
>@@ -415,6 +419,11 @@ asmlinkage long sys_fcntl64(unsigned int
> 			err = do_fcntl(fd, cmd, arg, filp);
> 			break;
> 	}
>+
>+	/* clean up posix locks established after the file was closed */
>+	f = fcheck(fd);
>+	if (f != filp)
>+		locks_remove_posix(filp, current->files);
> 	fput(filp);
> out:
> 	return err;

Actions: View | Diff

Attachments on bug 456282: 312392 | 312402 | 314636 | 325729 | 326611