summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSanidhya Kashyap <sanidhya.gatech@gmail.com>2015-03-21 19:57:50 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-09 23:35:31 +0300
commitce657611baf902f14ae559ce4e0787ead6712067 (patch)
tree43f2a918a0c4d8f7b9c3cc2418953ed0f34a0c70 /fs
parentd7b04097c250e6322ba73d3b03337074afeeb314 (diff)
downloadlinux-ce657611baf902f14ae559ce4e0787ead6712067.tar.xz
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.c7
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;