From patchwork Thu Dec 18 07:39:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Satoru Takeuchi X-Patchwork-Id: 5511391 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B04ADBEEA8 for ; Thu, 18 Dec 2014 07:41:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2733209EA for ; Thu, 18 Dec 2014 07:41:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7AF51209E1 for ; Thu, 18 Dec 2014 07:41:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751497AbaLRHjt (ORCPT ); Thu, 18 Dec 2014 02:39:49 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:42840 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750720AbaLRHjs (ORCPT ); Thu, 18 Dec 2014 02:39:48 -0500 Received: from kw-mxq.gw.nic.fujitsu.com (unknown [10.0.237.131]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id 81F203EE188 for ; Thu, 18 Dec 2014 16:39:47 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by kw-mxq.gw.nic.fujitsu.com (Postfix) with ESMTP id 80576AC0655 for ; Thu, 18 Dec 2014 16:39:46 +0900 (JST) Received: from g01jpfmpwyt03.exch.g01.fujitsu.local (g01jpfmpwyt03.exch.g01.fujitsu.local [10.128.193.57]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 252721DB804B for ; Thu, 18 Dec 2014 16:39:46 +0900 (JST) Received: from G01JPEXCHYT14.g01.fujitsu.local (G01JPEXCHYT14.g01.fujitsu.local [10.128.194.53]) by g01jpfmpwyt03.exch.g01.fujitsu.local (Postfix) with ESMTP id 4F31B46E588; Thu, 18 Dec 2014 16:39:45 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v2.0.1 X-SHieldMailCheckerPolicyVersion: FJ-ISEC-20120718-4 Message-ID: <549284AE.9020201@jp.fujitsu.com> Date: Thu, 18 Dec 2014 16:39:26 +0900 From: Satoru Takeuchi User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: "linux-btrfs@vger.kernel.org" CC: naota , Gui Hecheng Subject: [PATCH v2] Fix wrong memory free on check_is_root X-SecurityPolicyCheck-GC: OK by FENCE-Mail Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Satoru Takeuchi When "/" is Btrfs, "btrfs property /" regards it as non-root by mistake. check_is_root() regards @object as a file system root if the following two conditions are satisfied. a) Both @object and its parent directory are Btrfs object (file system root, subvolume, inode, and device used for Btrfs). b) fsid of the above mentioned two objects are different. It doesn't work if @object is "/" because, in this case, fsid of "/" and its parent (it's also "/"), are the same. * Test environment Two Btrfs file system (not subvolume) "/" and "/home/sat/mnt". * How to reproduce Submit "btrfs prop get" against the above mentioned file systems. * Test Result ** Actual result (without my patch) Reviewed-by: Gui Hecheng ========================== # btrfs prop get /home/sat/mnt/ ro=false label= # label is displayed because it's a file system root # btrfs prop get / ro=false # label is not displayed even if it's a file system root ========================== ** Expected result (with my patch) ========================== # ./btrfs-new prop get btrfs-auto-test/ # ./btrfs-new prop get /home/sat/mnt/ ro=false label= # ./btrfs-new prop get / ro=false label=foo # label is displayed =========================== Signed-off-by: Satoru Takeuchi Reported-by: Naohiro Aota --- changelog v2: Return a correct error code when realpath() fails. Thank you Gui Hecheng for pointing my mistake out. https://www.mail-archive.com/linux-btrfs@vger.kernel.org/msg40204.html --- cmds-property.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cmds-property.c b/cmds-property.c index a764293..6501338 100644 --- a/cmds-property.c +++ b/cmds-property.c @@ -124,7 +124,18 @@ static int check_is_root(const char *object) int ret; u8 fsid[BTRFS_FSID_SIZE]; u8 fsid2[BTRFS_FSID_SIZE]; - char *tmp; + char *tmp = NULL; + char *rp; + + rp = realpath(object, NULL); + if (!rp) { + ret = -errno; + goto out; + } + if (!strcmp(rp, "/")) { + ret = 0; + goto out; + } tmp = malloc(strlen(object) + 5); if (!tmp) { @@ -165,6 +176,7 @@ static int check_is_root(const char *object) out: free(tmp); + free(rp); return ret; }