From: Sanidhya Kashyap <[email protected]> 3.4.111-rc1 review patch. If anyone has any objections, please let me know.
------------------ 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 <[email protected]> Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> [lizf: Backported to 3.4: adjust context] Signed-off-by: Zefan Li <[email protected]> --- fs/hpfs/super.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c index 0bf578d..0b990b2 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c @@ -385,9 +385,13 @@ 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; + *flags |= MS_NOATIME; - + hpfs_lock(s); lock_super(s); uid = sbi->sb_uid; gid = sbi->sb_gid; -- 1.9.1
