diff options
author | Anatol Pomozov <anatol.pomozov@gmail.com> | 2012-09-12 23:11:55 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-22 23:31:32 -0500 |
commit | 39b652527457452f09b35044fb4f8b3b0eabafdf (patch) | |
tree | acd8fda1d4e37c58c68fe0cfb9288d5d06e14441 /ipc | |
parent | 1afc99beaf0fca3767d9b67789a7ae91c4f7a9c9 (diff) |
fs: Preserve error code in get_empty_filp(), part 2
Allocating a file structure in function get_empty_filp() might fail because
of several reasons:
- not enough memory for file structures
- operation is not allowed
- user is over its limit
Currently the function returns NULL in all cases and we loose the exact
reason of the error. All callers of get_empty_filp() assume that the function
can fail with ENFILE only.
Return error through pointer. Change all callers to preserve this error code.
[AV: cleaned up a bit, carved the get_empty_filp() part out into a separate commit
(things remaining here deal with alloc_file()), removed pipe(2) behaviour change]
Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
Reviewed-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/shm.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1042,7 +1042,8 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, | |||
1042 | is_file_hugepages(shp->shm_file) ? | 1042 | is_file_hugepages(shp->shm_file) ? |
1043 | &shm_file_operations_huge : | 1043 | &shm_file_operations_huge : |
1044 | &shm_file_operations); | 1044 | &shm_file_operations); |
1045 | if (!file) | 1045 | err = PTR_ERR(file); |
1046 | if (IS_ERR(file)) | ||
1046 | goto out_free; | 1047 | goto out_free; |
1047 | 1048 | ||
1048 | file->private_data = sfd; | 1049 | file->private_data = sfd; |