diff options
author | Micah Cowan <micah@cowan.name> | 2007-07-16 02:40:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:43 -0400 |
commit | 17973f5af741f1758ed57c5115ca394c22bee159 (patch) | |
tree | 0fd340e46f1fbae4ab7aa8d06b26af208a3e83f4 | |
parent | 1e3e8d91fee56e1ab598b265466dc38033f1b915 (diff) |
Only send SIGXFSZ when exceeding rlimits.
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>
-rw-r--r-- | fs/ncpfs/file.c | 2 | ||||
-rw-r--r-- | fs/reiserfs/file.c | 1 | ||||
-rw-r--r-- | mm/filemap.c | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index d3152f8d95c6..2b145de45b39 100644 --- 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 * | |||
203 | 203 | ||
204 | if (pos + count > MAX_NON_LFS && !(file->f_flags&O_LARGEFILE)) { | 204 | if (pos + count > MAX_NON_LFS && !(file->f_flags&O_LARGEFILE)) { |
205 | if (pos >= MAX_NON_LFS) { | 205 | if (pos >= MAX_NON_LFS) { |
206 | send_sig(SIGXFSZ, current, 0); | ||
207 | return -EFBIG; | 206 | return -EFBIG; |
208 | } | 207 | } |
209 | if (count > MAX_NON_LFS - (u32)pos) { | 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 | if (pos >= inode->i_sb->s_maxbytes) { | 212 | if (pos >= inode->i_sb->s_maxbytes) { |
214 | if (count || pos > inode->i_sb->s_maxbytes) { | 213 | if (count || pos > inode->i_sb->s_maxbytes) { |
215 | send_sig(SIGXFSZ, current, 0); | ||
216 | return -EFBIG; | 214 | return -EFBIG; |
217 | } | 215 | } |
218 | } | 216 | } |
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index 30eebfb1b2d8..2070aeee2a52 100644 --- 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 | |||
1305 | if (get_inode_item_key_version (inode) == KEY_FORMAT_3_5 && | 1305 | if (get_inode_item_key_version (inode) == KEY_FORMAT_3_5 && |
1306 | *ppos + count > MAX_NON_LFS) { | 1306 | *ppos + count > MAX_NON_LFS) { |
1307 | if (*ppos >= MAX_NON_LFS) { | 1307 | if (*ppos >= MAX_NON_LFS) { |
1308 | send_sig(SIGXFSZ, current, 0); | ||
1309 | return -EFBIG; | 1308 | return -EFBIG; |
1310 | } | 1309 | } |
1311 | if (count > MAX_NON_LFS - (unsigned long)*ppos) | 1310 | if (count > MAX_NON_LFS - (unsigned long)*ppos) |
diff --git a/mm/filemap.c b/mm/filemap.c index adbac104f34c..100b99c2d504 100644 --- 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 | |||
1967 | if (unlikely(*pos + *count > MAX_NON_LFS && | 1967 | if (unlikely(*pos + *count > MAX_NON_LFS && |
1968 | !(file->f_flags & O_LARGEFILE))) { | 1968 | !(file->f_flags & O_LARGEFILE))) { |
1969 | if (*pos >= MAX_NON_LFS) { | 1969 | if (*pos >= MAX_NON_LFS) { |
1970 | send_sig(SIGXFSZ, current, 0); | ||
1971 | return -EFBIG; | 1970 | return -EFBIG; |
1972 | } | 1971 | } |
1973 | if (*count > MAX_NON_LFS - (unsigned long)*pos) { | 1972 | 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 | |||
1985 | if (likely(!isblk)) { | 1984 | if (likely(!isblk)) { |
1986 | if (unlikely(*pos >= inode->i_sb->s_maxbytes)) { | 1985 | if (unlikely(*pos >= inode->i_sb->s_maxbytes)) { |
1987 | if (*count || *pos > inode->i_sb->s_maxbytes) { | 1986 | if (*count || *pos > inode->i_sb->s_maxbytes) { |
1988 | send_sig(SIGXFSZ, current, 0); | ||
1989 | return -EFBIG; | 1987 | return -EFBIG; |
1990 | } | 1988 | } |
1991 | /* zero-length writes at ->s_maxbytes are OK */ | 1989 | /* zero-length writes at ->s_maxbytes are OK */ |