diff options
| author | Sanidhya Kashyap <sanidhya.gatech@gmail.com> | 2015-03-21 12:57:50 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-03 09:29:19 -0700 |
| commit | 53c34bd0491cadbe4cbc211327f608ebc8ba4eaa (patch) | |
| tree | d83fb424f4b5ec5ad136e0e33dde471d0cf82124 | |
| parent | abf09a2bc0b62809acf20486190071696f5f1d7b (diff) | |
hpfs: kstrdup() out of memory handling
commit ce657611baf902f14ae559ce4e0787ead6712067 upstream.
There is a possibility of nothing being allocated to the new_opts in
case of memory pressure, therefore return ENOMEM for such case.
Signed-off-by: Sanidhya Kashyap <sanidhya.gatech@gmail.com>
Signed-off-by: Mikulas Patocka <mikulas@twibright.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/hpfs/super.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c index 7cd00d3a7c9b..e12a06b300e0 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c @@ -424,11 +424,14 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data) int o; struct hpfs_sb_info *sbi = hpfs_sb(s); char *new_opts = kstrdup(data, GFP_KERNEL); - + + if (!new_opts) + return -ENOMEM; + sync_filesystem(s); *flags |= MS_NOATIME; - + hpfs_lock(s); uid = sbi->sb_uid; gid = sbi->sb_gid; umask = 0777 & ~sbi->sb_mode; |