diff options
author | Sanidhya Kashyap <sanidhya.gatech@gmail.com> | 2015-03-21 12:57:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-09 13:35:31 -0700 |
commit | ce657611baf902f14ae559ce4e0787ead6712067 (patch) | |
tree | 43f2a918a0c4d8f7b9c3cc2418953ed0f34a0c70 /fs | |
parent | d7b04097c250e6322ba73d3b03337074afeeb314 (diff) | |
download | linux-stable-ce657611baf902f14ae559ce4e0787ead6712067.tar.gz linux-stable-ce657611baf902f14ae559ce4e0787ead6712067.tar.bz2 linux-stable-ce657611baf902f14ae559ce4e0787ead6712067.zip |
hpfs: kstrdup() out of memory handling
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>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-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 0642516d36c8..cde044d41f69 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c @@ -451,11 +451,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; |