Received: by 10.213.65.68 with SMTP id h4csp1015487imn; Tue, 20 Mar 2018 23:50:02 -0700 (PDT) X-Google-Smtp-Source: AG47ELtt2n2dIsifCx9hiSiSNX+2nSlgSzAKyASg5vgx0x3AORO4USiHyVuiX6Yyrn1PgR+M703/ X-Received: by 2002:a17:902:6ec5:: with SMTP id l5-v6mr19480693pln.113.1521615001972; Tue, 20 Mar 2018 23:50:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521615001; cv=none; d=google.com; s=arc-20160816; b=kueiexJ8xS/YaUlvFXnsVu7wJxcfyPLeqxcB76tXRdVbFhDKoECuSG27S34yOkTO8R I3dUR+oSaHdb6uNl+pFkUryqKCeSq5uBzxs7mZIdy7/Fi21bz37CDS/P3iBK9D23lTgk VZmHX0glkAMN+M0UDv3BDXqfRN/mGxoANlI0zW0OzJUMc6z5D7IbX8c52MkmM3bwGZbb JZb0BY5Q+65V7Up5NGpNPOMwQLKlBFSCEyHnIpPEa2uVU6A1CAAo8XUtLZ8GJPQ7L34r vc17T4m4QlAFai4pUhqZF7xTMF4SHxIqhNt73N4BqD5rQQcja9Jso3MZeFu1KiSUbSV1 oFew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=CFKuDwBjSOdY+jH2dZH8Zb23saUD79JqjL40bBqsraQ=; b=K88vcbl46JlB1ZY26daMli9Ts6hujxJ7XdXgQ4qMHO870O2++SteHuJ0CL5TxDW3Vi /odQFyC52B/ymsSnV/uCoTOtMd72amnO/odUWDmIsfLSwqesKYeWPvlbTehI7H0gQw3C 2pgbEZ6fdz91IDbU+QDIvfIT7l4qGm7i/+S0vCD48ePrdFdtp9Z2+STAJPZlYuy5WBzK LoPc0iQ/Xga0IpyYZZBQefHVUYzTG6zXdqJnC974J8LRl8ggyd+aSkBbfUCowSfUolcR 9fzEzELBVPWMh9NZNQPJt2QvDpXBGU47AZtHvL6hLl42j9fyLfNMNeuandR7x1I0dDxo bVCQ== ARC-Authentication-Results: i=1; mx.google.com; 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 e127si2319358pgc.170.2018.03.20.23.49.48; Tue, 20 Mar 2018 23:50:01 -0700 (PDT) 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; 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 S1751691AbeCUGsn (ORCPT + 99 others); Wed, 21 Mar 2018 02:48:43 -0400 Received: from mout.gmx.net ([212.227.17.22]:36795 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751459AbeCUGsm (ORCPT ); Wed, 21 Mar 2018 02:48:42 -0400 Received: from juanniu018037.ss.mogujie.org ([122.225.81.134]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MXqV1-1f3tOz3yND-00WnGi; Wed, 21 Mar 2018 07:48:23 +0100 From: Chengguang Xu To: ericvh@gmail.com, rminnich@sandia.gov, lucho@ionkov.net Cc: v9fs-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chengguang Xu Subject: [PATCH] 9p: check memory allocation result for cachetag Date: Wed, 21 Mar 2018 14:48:09 +0800 Message-Id: <1521614889-73446-1-git-send-email-cgxu519@gmx.com> X-Mailer: git-send-email 1.8.3.1 X-Provags-ID: V03:K0:iCw0FX3nZMFg319fY2Y2mDfPlk8WM+h73epFQSl+FQg9+SmLh4l 6pvwLRIm+O9hpf8II//xwZ1n76sj7OukhRzRSXUGE0PHX2JdG7xlrIlvZAwPz8zJT8ULucQ orCiqFBrn36mHwws39DO8bp52gZyxMBuTXOmbcqQlCx+A3iuGPC1YyVWztBn2VQ4HbNsJmI GtaS4AJMHvgfozzIR/rDg== X-UI-Out-Filterresults: notjunk:1;V01:K0:tOabwKbytRs=:G0p1nCSYqe8slULC7KD6uk AUB7mdmfytJ0fgK9LjqWPlBT1Kt8tBNlqo0Kv7Z4E5/Aq6mECX5NwVAD+Qv2mjUwK5g7O2wsw Srf2BtM5mwdQzw1oefp94T/HgbgykFvJmTke0hBF2X3+5Nkomwjx7k7QBPqG31NZyztv0x3YM 9OuGARnESgSchHRarxKnEEpWhEbg6E5rIFIY+Jw2wApIAKzvuSEsDXQP04dl7meNB/SBw+p+o XNFxR3BZsYlTHWHMp5CgMQbGROv851fPNW6aWNLy+ci7t/7+WDKIwhKA3kgAfj7g7qdVgG7lX xjnVOZCF8+NJnlZGypJngtDNCtE9ijdg2gtMyBss4VgLEHuRkYP3J96CIreODJfoJoLafWNX/ 2W1APKgrjBS3R+BbLcJBq4XnNj9+c8Fadt6WSqOi1loYUcJFp4Sa4RpkarLckgtZWV0q3BNNC 5NFL4mTZhND4yJHBAvXyQTSmDXI3FOYX5uachZr9exY+8t/Nnc6n/fFBiJDfHjztXxfhtVfGr VnbVwgk7Hc/CkiMNSt1QDqMjSnGZlN//zjcw47L9vylroJQSpvLmTEaHopp4s8foipvk6NdHq Ib8zFzvbNXsl1jkOvuTqyR/hPLBzUul6y4B2LJxoqh3ovWe1cpqL6hrN2Q3qwIeMNEMGoYVbd vWG3LzYV79kxSn+QR+s2jbtfcgfzjxYl1ogWVSaQ060wntaFzNZh8kpTd2bUFL+9QRr17N8fp fQs+ta6VZrpGfjUgdpEq9EYk0fhzkrMQf+3x6wSdx9gkukw0dVZtDgJ68WHyDqaryS52SVp+k +I8/AVXwfBbloAwB7xuRZG03N/+VA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Check memory allocation result for cachetag in mount option parsing and fix potential memory leak in the error case. Signed-off-by: Chengguang Xu --- fs/9p/v9fs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index 8fb89dd..e622f0f 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c @@ -292,6 +292,10 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts) #ifdef CONFIG_9P_FSCACHE kfree(v9ses->cachetag); v9ses->cachetag = match_strdup(&args[0]); + if (!v9ses->cachetag) { + ret = -ENOMEM; + goto free_and_return; + } #endif break; case Opt_cache: @@ -471,6 +475,9 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses, return fid; err_clnt: +#ifdef CONFIG_9P_FSCACHE + kfree(v9ses->cachetag); +#endif p9_client_destroy(v9ses->clnt); err_names: kfree(v9ses->uname); -- 1.8.3.1