Only send SIGXFSZ when exceeding rlimits.

micahcowan · Linus Torvalds · commit 17973f5af741 · 2007-07-16T09:05:43.000-07:00
Some users have been having problems with utilities like cp or dd dumping core when they try to copy a file that's too large for the destination filesystem (typically, > 4gb). Apparently, some defunct standards required SIGXFSZ to be sent in such circumstances, but SUS only requires/allows it for when a written file exceeds the process's resource limits. I'd like to limit SIGXFSZs to the bare minimum required by SUS. Patch sent per http://lkml.org/lkml/2007/4/10/302 Signed-off-by: Micah Cowan <micahcowan@ubuntu.com> Acked-by: Alan Cox <alan@redhat.com> Cc: <reiserfs-dev@namesys.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
@@ -203,7 +203,6 @@ ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *
 
 	if (pos + count > MAX_NON_LFS && !(file->f_flags&O_LARGEFILE)) {
 		if (pos >= MAX_NON_LFS) {
-			send_sig(SIGXFSZ, current, 0);
 			return -EFBIG;
 		}
 		if (count > MAX_NON_LFS - (u32)pos) {
@@ -212,7 +211,6 @@ ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *
 	}
 	if (pos >= inode->i_sb->s_maxbytes) {
 		if (count || pos > inode->i_sb->s_maxbytes) {
-			send_sig(SIGXFSZ, current, 0);
 			return -EFBIG;
 		}
 	}
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
@@ -1305,7 +1305,6 @@ static ssize_t reiserfs_file_write(struct file *file,	/* the file we are going t
 	if (get_inode_item_key_version (inode) == KEY_FORMAT_3_5 &&
 	    *ppos + count > MAX_NON_LFS) {
 		if (*ppos >= MAX_NON_LFS) {
-			send_sig(SIGXFSZ, current, 0);
 			return -EFBIG;
 		}
 		if (count > MAX_NON_LFS - (unsigned long)*ppos)
diff --git a/mm/filemap.c b/mm/filemap.c
@@ -1967,7 +1967,6 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
 	if (unlikely(*pos + *count > MAX_NON_LFS &&
 				!(file->f_flags & O_LARGEFILE))) {
 		if (*pos >= MAX_NON_LFS) {
-			send_sig(SIGXFSZ, current, 0);
 			return -EFBIG;
 		}
 		if (*count > MAX_NON_LFS - (unsigned long)*pos) {
@@ -1985,7 +1984,6 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
 	if (likely(!isblk)) {
 		if (unlikely(*pos >= inode->i_sb->s_maxbytes)) {
 			if (*count || *pos > inode->i_sb->s_maxbytes) {
-				send_sig(SIGXFSZ, current, 0);
 				return -EFBIG;
 			}
 			/* zero-length writes at ->s_maxbytes are OK */

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,6 @@ ncp_file_write(struct file file, const char __user buf, size_t count, loff_t *`
`203`	`203`
`204`	`204`	`if (pos + count > MAX_NON_LFS && !(file->f_flags&O_LARGEFILE)) {`
`205`	`205`	`if (pos >= MAX_NON_LFS) {`
`206`		`- send_sig(SIGXFSZ, current, 0);`
`207`	`206`	`return -EFBIG;`
`208`	`207`	`}`
`209`	`208`	`if (count > MAX_NON_LFS - (u32)pos) {`
`@@ -212,7 +211,6 @@ ncp_file_write(struct file file, const char __user buf, size_t count, loff_t *`
`212`	`211`	`}`
`213`	`212`	`if (pos >= inode->i_sb->s_maxbytes) {`
`214`	`213`	`if (count \|\| pos > inode->i_sb->s_maxbytes) {`
`215`		`- send_sig(SIGXFSZ, current, 0);`
`216`	`214`	`return -EFBIG;`
`217`	`215`	`}`
`218`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1305,7 +1305,6 @@ static ssize_t reiserfs_file_write(struct file file, / the file we are going t`
`1305`	`1305`	`if (get_inode_item_key_version (inode) == KEY_FORMAT_3_5 &&`
`1306`	`1306`	`*ppos + count > MAX_NON_LFS) {`
`1307`	`1307`	`if (*ppos >= MAX_NON_LFS) {`
`1308`		`- send_sig(SIGXFSZ, current, 0);`
`1309`	`1308`	`return -EFBIG;`
`1310`	`1309`	`}`
`1311`	`1310`	`if (count > MAX_NON_LFS - (unsigned long)*ppos)`