Attachment 312687 Details for Bug 456453 – patch that fixes the short reads

[patch] patch that fixes the short reads

size_check.patch (text/plain), 1.77 KB, created by Ben Marzinski on 2008-07-25 22:02:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Marzinski

Created: 2008-07-25 22:02:10 UTC

Size: 1.77 KB

patch

obsolete

>diff -urpN --exclude-from=linux-2.6.18.i686/Documentation/dontdiff linux-2.6.18.i686/fs/gfs2/ops_file.c linux-2.6.18.i686-patched/fs/gfs2/ops_file.c
>--- linux-2.6.18.i686/fs/gfs2/ops_file.c	2008-07-24 12:32:42.000000000 -0500
>+++ linux-2.6.18.i686-patched/fs/gfs2/ops_file.c	2008-07-25 08:57:55.000000000 -0500
>@@ -237,7 +237,7 @@ void gfs2_set_inode_flags(struct inode *
> 		flags |= S_NOATIME;
> 	if (di->di_flags & GFS2_DIF_SYNC)
> 		flags |= S_SYNC;
>-	inode->i_flags = flags;
>+	inode->i_flags = flags | S_NOSIZECHK;
> }
> 
> /* Flags that can be set by user space */
>diff -urpN --exclude-from=linux-2.6.18.i686/Documentation/dontdiff linux-2.6.18.i686/include/linux/fs.h linux-2.6.18.i686-patched/include/linux/fs.h
>--- linux-2.6.18.i686/include/linux/fs.h	2008-07-24 12:32:36.000000000 -0500
>+++ linux-2.6.18.i686-patched/include/linux/fs.h	2008-07-25 07:57:39.000000000 -0500
>@@ -150,6 +150,7 @@ extern int dir_notify_enable;
> 
> /* RHEL only flags -- These are not upstream! */
> #define S_NOATTRKILL	65536	/* don't convert ATTR_KILL_* to mode change */
>+#define S_NOSIZECHK	131072	/* don't skip reads past the end of the file */
> 
> /*
>  * Note that nosuid etc flags are inode-specific: setting some file-system
>diff -urpN --exclude-from=linux-2.6.18.i686/Documentation/dontdiff linux-2.6.18.i686/mm/filemap.c linux-2.6.18.i686-patched/mm/filemap.c
>--- linux-2.6.18.i686/mm/filemap.c	2008-07-24 15:45:41.000000000 -0500
>+++ linux-2.6.18.i686-patched/mm/filemap.c	2008-07-25 08:00:42.000000000 -0500
>@@ -1212,7 +1212,7 @@ __generic_file_aio_read(struct kiocb *io
> 		if (!count)
> 			goto out; /* skip atime */
> 		size = i_size_read(inode);
>-		if (pos < size) {
>+		if (pos < size || (inode->i_flags & S_NOSIZECHK)) {
> 			retval = generic_file_direct_IO(READ, iocb,
> 						iov, pos, nr_segs);
> 			if (retval > 0)

Actions: View | Diff

Attachments on bug 456453: 312687 | 314123