diff options
| author | Sanidhya Kashyap <sanidhya.gatech@gmail.com> | 2015-03-21 12:57:50 -0400 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-08-10 09:54:02 +0100 |
| commit | 5bbb9aca6b4e1f6a2093fb840216e4ba4266e592 (patch) | |
| tree | 677d3bc4e22d86e215e1e450e5429672e04c73ce /fs/hpfs | |
| parent | dc5203b2b91999a223ffbdc70a347242695aa6ed (diff) | |
| download | linux-stable-5bbb9aca6b4e1f6a2093fb840216e4ba4266e592.tar.gz linux-stable-5bbb9aca6b4e1f6a2093fb840216e4ba4266e592.tar.bz2 linux-stable-5bbb9aca6b4e1f6a2093fb840216e4ba4266e592.zip | |
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: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs/hpfs')
| -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; |