Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5638049imu; Mon, 26 Nov 2018 03:21:17 -0800 (PST) X-Google-Smtp-Source: AFSGD/VmVzXIYbyaL0qunwxvMolCFOB7ywmKDZOM60F5GM5gJ9iiDNDIkC6tVBAEqQMWjg82Od9A X-Received: by 2002:a65:5088:: with SMTP id r8mr23913342pgp.15.1543231277373; Mon, 26 Nov 2018 03:21:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543231277; cv=none; d=google.com; s=arc-20160816; b=gyi3ZDjxs4POjFJOmibaFVFX/T3YgGrAMkVaYaNGGkYfLFz9Pc7GrjHfBfk3vJTiPI jI1+iteg/jQ15OmqQelN47mPeA8rzCWFtY/2Y0Ovzt7DHyqcNBfhA6brYkBMNOeus0r5 mZJ190Yazjh0r9MIMzTaWSU5Hsh99ReGZDDZrjLs5fdX6O3YFKc52fHuAqyRXos1g34h KcD1sNGAZuqVJTQrTfNKzNwCcVyaS9AbsgK7lVx+RQV9CKtyl4JtNEfaVwSqRF4KiydI n5rMbDwHo6cV3JCYA9IN7EeqSI+9ZNGsrO8r6bMgnDkdhrntu47h/BCcAYQctcB7+9Bc OZEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RZ7FMEzj4Fpie9iBd/RfXgRrMOkHeexzoqGx7AbBo64=; b=sZZWUN1aViPb73lyDJPbPcpJIfMKTGoLjMrd7vvID8so5//C8PN7mAlLgH2PrJC0eE lAttvVURL0yXhj0eR64D1DZLCi5dkgTsnl4U4wh923UPPo/eyoat2upW4Q3w7BFtpX4E fWdss/qZKiNrpnUy6c1DpYitjIpTgAhUWFN8fWhj7msMWFvMilTnNlR+Fnj89qxUGD1a QcLZkNiIyTS5z7RGbiLRqXV97BkXoTNAMJ6UZ5pow59j1lN972jBxBc2kSUYatzY7RDK jJI2YHCgEIDJFZfcdMhCt3QKZmYAD0g9SjDs5FVjCLvhbOTm3ONGFQacBJVDoVmpEYaW vDAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Gxumx/pM"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x5si62316261pgq.535.2018.11.26.03.20.55; Mon, 26 Nov 2018 03:21:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Gxumx/pM"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729435AbeKZVww (ORCPT + 99 others); Mon, 26 Nov 2018 16:52:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:34410 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727875AbeKZVwv (ORCPT ); Mon, 26 Nov 2018 16:52:51 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0F4F021473; Mon, 26 Nov 2018 10:59:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543229946; bh=2YkuDvduXmUqwRfNxpNqkKoVhVjjrKZblW9YkYY/1ZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gxumx/pMGqNeRHWiF5wSCOzL5ZC+0HOMo9LZbgif6t3LI5pKor/j0h9n1cEcFodZ9 4igELHn+NQs0X+coHHzQMKce+gD7+FuSj14YQz+/GRaWb55v2ZwArrFLmRdtckrk/A o17HIUVdAwCe6lR8oGr/P+7y0v1gzGVBBNrlJoKg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chengguang Xu , Al Viro , Sasha Levin Subject: [PATCH 4.14 14/62] fs/exofs: fix potential memory leak in mount option parsing Date: Mon, 26 Nov 2018 11:50:55 +0100 Message-Id: <20181126105052.063766745@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181126105050.592727680@linuxfoundation.org> References: <20181126105050.592727680@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 515f1867addaba49c1c6ac73abfaffbc192c1db4 ] There are some cases can cause memory leak when parsing option 'osdname'. Signed-off-by: Chengguang Xu Signed-off-by: Al Viro Signed-off-by: Sasha Levin --- fs/exofs/super.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/exofs/super.c b/fs/exofs/super.c index 819624cfc8da..c9ec652e2fcd 100644 --- a/fs/exofs/super.c +++ b/fs/exofs/super.c @@ -100,6 +100,7 @@ static int parse_options(char *options, struct exofs_mountopt *opts) token = match_token(p, tokens, args); switch (token) { case Opt_name: + kfree(opts->dev_name); opts->dev_name = match_strdup(&args[0]); if (unlikely(!opts->dev_name)) { EXOFS_ERR("Error allocating dev_name"); @@ -863,8 +864,10 @@ static struct dentry *exofs_mount(struct file_system_type *type, int ret; ret = parse_options(data, &opts); - if (ret) + if (ret) { + kfree(opts.dev_name); return ERR_PTR(ret); + } if (!opts.dev_name) opts.dev_name = dev_name; -- 2.17.1