Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935114AbcCPIpX (ORCPT ); Wed, 16 Mar 2016 04:45:23 -0400 Received: from mail.kernel.org ([198.145.29.136]:59009 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965718AbcCPIHR (ORCPT ); Wed, 16 Mar 2016 04:07:17 -0400 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sanidhya Kashyap , Mikulas Patocka , Linus Torvalds , Zefan Li Subject: [PATCH 3.4 007/107] hpfs: kstrdup() out of memory handling Date: Wed, 16 Mar 2016 16:05:01 +0800 Message-Id: <1458115601-5762-7-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458115541-5712-1-git-send-email-lizf@kernel.org> References: <1458115541-5712-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1161 Lines: 43 From: Sanidhya Kashyap 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 Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds [lizf: Backported to 3.4: adjust context] Signed-off-by: Zefan Li --- 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