From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CA47413798 for ; Thu, 13 Aug 2026 06:34:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786602855; cv=none; b=crJsXZQm2AzN0iS4+2c9dQw/2UZ/8hflGlTHJxxp4ValbmYoPpFQE43hQs1SBh4Vgn6i82tFBUbQv82Umyl1eILQ9MsD4kgkQ0QzLhMlnJPYWuCigszhDewAkG4qGEWtO1uVLnY/mLuEJonf5/9S4XJfuukWRQDw5uCcXj0oAgI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786602855; c=relaxed/simple; bh=H+hFoYvKGCSPDDX/N+csVvj1asWuxFl1s+Y8P5H56zs=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=gevR1LW2Tv+uLRZ3L6LkPdoLeQgBebv0UH2tFLRBf4Lqwc5AebXjQENFRgmOqJtqz1ZgwaCKrZbWzLCwvF7CvggnYqucEu2gyz5R6x2wC62ti/kThlN/hnVLCHzi4Q7O49vlIT5d7Il8JktD7MhTF27JhiAJbCvn9fxYPk8Sdho= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=dCSg6bz9; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="dCSg6bz9" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-49556f97a9dso10402615e9.1 for ; Wed, 12 Aug 2026 23:34:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1786602852; x=1787207652; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=IR19d7dz25eJhpnRyH/IxVmhKX79dV80a3exCVUcmjw=; b=dCSg6bz9gc6meAXVfM/nA+eeqiB8LSy8o8MpmJwcvs9F9GufKiaAOpLUg+MQ/UB/1X b6craTYkgR9LPOxREYNP18BtvqadnGriC5tCaLmKgDcTUqzIYIYl70ekP5AUlc5ZRROv oYCUFNVfId1bl+Cx8QXnvwWb54F5jFhh4etuY0culAxSOUEiaMggCCV8QaIrzTub6NaN ypA1YzIk0MrVoRwZhAtDIZcMrdSTdd9+j40utIQlr4zfuSkLUj4gZftPA9m9CmGtXs3p 31YjdKtWpEDwXRFaJhvv3DxUAdgtTw/Rp7DuyAVa2nq8hRbV2PDSvOF6cjQG3ET2xFNr hMNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786602852; x=1787207652; h=content-transfer-encoding:content-type:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=IR19d7dz25eJhpnRyH/IxVmhKX79dV80a3exCVUcmjw=; b=JINf32Cop3oHE12k2wBsnefx7lLgMZG5yhr2ngn+r6/O+AkPAn8sKWlMEAo/yM8hDJ t09ruT27YCxLYwp+dfNp/m7eD5HQY/+t5bXJzngTXwIHriyeBzUtWXyZ2POYceaWXisF p6sDzn5GYHmayl2rs73tbf7Kv9mTeZgPzaD7nMcBl6LvCd8YrypdeQ8MvDAtYJJMm1uo yKNJ88ka122pdP6+0G7dmzU51vUY9tSt6WhqLv8ttZcmJiWCiazd0MvYVCQe9/7POPLD AOQgTxCXq7TenykDyrB8N6hg7INs7vw+Ir0qWSViTV94MmYZUY02jSlQK8YREF4Pv5Yv 0Hdw== X-Forwarded-Encrypted: i=1; AHgh+RoyKx6+K+l/mqIAHK7cDdpaZbwyhDRym/GJ120hmoUjl4dFjUrqgyUGHV5Bd7M82LFhXhxI9shO01UpX60=@vger.kernel.org X-Gm-Message-State: AOJu0YzoY9wcdMOW+LfEUwAvUhZhxf+r52b1Q/fP5Ct89HkmzSQIMTHH hafGgsK7QaJIVTpMn9p/tLE9JSihKhncbLiy2EyQHYaMAqTdwlujEGoDniQ29AFiL1A= X-Gm-Gg: AR+sD12jkClVVGIzN8UVyg5WYs0+PsJW/bGw43mCTRflUVnJW8z8mhqvoa0jiQKqz1o PwhvL1ptV6lWQE+g3Epom9tqAUtu9xFZsTvTBpVKo8y9rRhIqCp/wDEYvCRl/Phwul8LjzsZk2H VSPmZafMgCyvz9S+Ts94HqbPMTRZMhIInqqyDy2lye6v/YOWRCq7ZSL5HDDEMQ9uTOP96h/OepP 11Y2xKOcSCKjq62bmG+htsfRcsyuw26GpJeGhVgek+uYXgKCnkH0S/Ie9+Ts2ZNbGsEmzEKdcAT LAjHhQhtW7WFdRh4iapa517JOe7UiZ4eKMMZWkorT6Hwm2KF34nXYc7gPuTgMi8jJSxHC+yDO2S Jqfy+GKCtpxacczh4uqLpgl7EwG89tzzdBg5lqOwWkilJe+aY8jA9aOND1lVdi7cP0sGKGyK1H2 pCp+glt7l+kyvTxkja0Wgd0YXxXESdC5kH2x1oJyfSiK9O71ZqvY9zGw== X-Received: by 2002:a05:600c:1f83:b0:497:fecd:5b00 with SMTP id 5b1f17b1804b1-499821c67c3mr30803175e9.9.1786602852419; Wed, 12 Aug 2026 23:34:12 -0700 (PDT) Received: from [172.16.0.229] ([159.196.52.54]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1412d961bf7sm5379585c88.10.2026.08.12.23.34.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Aug 2026 23:34:11 -0700 (PDT) Message-ID: Date: Thu, 13 Aug 2026 16:04:05 +0930 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] btrfs: use mount idmap for defrag permission check To: Tao Cui , clm@fb.com, dsterba@suse.com Cc: josef@toxicpanda.com, brauner@kernel.org, sforshee@kernel.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Tao Cui References: <20260813034146.1207640-1-cui.tao@linux.dev> Content-Language: en-US From: Qu Wenruo Autocrypt: addr=wqu@suse.com; keydata= xsBNBFnVga8BCACyhFP3ExcTIuB73jDIBA/vSoYcTyysFQzPvez64TUSCv1SgXEByR7fju3o 8RfaWuHCnkkea5luuTZMqfgTXrun2dqNVYDNOV6RIVrc4YuG20yhC1epnV55fJCThqij0MRL 1NxPKXIlEdHvN0Kov3CtWA+R1iNN0RCeVun7rmOrrjBK573aWC5sgP7YsBOLK79H3tmUtz6b 9Imuj0ZyEsa76Xg9PX9Hn2myKj1hfWGS+5og9Va4hrwQC8ipjXik6NKR5GDV+hOZkktU81G5 gkQtGB9jOAYRs86QG/b7PtIlbd3+pppT0gaS+wvwMs8cuNG+Pu6KO1oC4jgdseFLu7NpABEB AAHNGFF1IFdlbnJ1byA8d3F1QHN1c2UuY29tPsLAlAQTAQgAPgIbAwULCQgHAgYVCAkKCwIE FgIDAQIeAQIXgBYhBC3fcuWlpVuonapC4cI9kfOhJf6oBQJnEXVgBQkQ/lqxAAoJEMI9kfOh Jf6o+jIH/2KhFmyOw4XWAYbnnijuYqb/obGae8HhcJO2KIGcxbsinK+KQFTSZnkFxnbsQ+VY fvtWBHGt8WfHcNmfjdejmy9si2jyy8smQV2jiB60a8iqQXGmsrkuR+AM2V360oEbMF3gVvim 2VSX2IiW9KERuhifjseNV1HLk0SHw5NnXiWh1THTqtvFFY+CwnLN2GqiMaSLF6gATW05/sEd V17MdI1z4+WSk7D57FlLjp50F3ow2WJtXwG8yG8d6S40dytZpH9iFuk12Sbg7lrtQxPPOIEU rpmZLfCNJJoZj603613w/M8EiZw6MohzikTWcFc55RLYJPBWQ+9puZtx1DopW2jOwE0EWdWB rwEIAKpT62HgSzL9zwGe+WIUCMB+nOEjXAfvoUPUwk+YCEDcOdfkkM5FyBoJs8TCEuPXGXBO Cl5P5B8OYYnkHkGWutAVlUTV8KESOIm/KJIA7jJA+Ss9VhMjtePfgWexw+P8itFRSRrrwyUf E+0WcAevblUi45LjWWZgpg3A80tHP0iToOZ5MbdYk7YFBE29cDSleskfV80ZKxFv6koQocq0 vXzTfHvXNDELAuH7Ms/WJcdUzmPyBf3Oq6mKBBH8J6XZc9LjjNZwNbyvsHSrV5bgmu/THX2n g/3be+iqf6OggCiy3I1NSMJ5KtR0q2H2Nx2Vqb1fYPOID8McMV9Ll6rh8S8AEQEAAcLAfAQY AQgAJgIbDBYhBC3fcuWlpVuonapC4cI9kfOhJf6oBQJnEXWBBQkQ/lrSAAoJEMI9kfOhJf6o cakH+QHwDszsoYvmrNq36MFGgvAHRjdlrHRBa4A1V1kzd4kOUokongcrOOgHY9yfglcvZqlJ qfa4l+1oxs1BvCi29psteQTtw+memmcGruKi+YHD7793zNCMtAtYidDmQ2pWaLfqSaryjlzR /3tBWMyvIeWZKURnZbBzWRREB7iWxEbZ014B3gICqZPDRwwitHpH8Om3eZr7ygZck6bBa4MU o1XgbZcspyCGqu1xF/bMAY2iCDcq6ULKQceuKkbeQ8qxvt9hVxJC2W3lHq8dlK1pkHPDg9wO JoAXek8MF37R8gpLoGWl41FIUb3hFiu3zhDDvslYM4BmzI18QgQTQnotJH8= In-Reply-To: <20260813034146.1207640-1-cui.tao@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 在 2026/8/13 13:11, Tao Cui 写道: > From: Tao Cui > > btrfs_ioctl_defrag() checks MAY_WRITE with nop_mnt_idmap, which skips > the mount idmap. On an idmapped mount the owner comparison then uses > the caller's fsuid against the raw on-disk uid, dropping the mapping. > Every other permission/owner check in btrfs ioctl uses > file_mnt_idmap(file) (e.g. :1152, :1310, :1946); this one missed it. > > Switch to file_mnt_idmap(file). It equals nop_mnt_idmap on a normal > mount, and the check stays behind !capable(CAP_SYS_ADMIN), so only > unprivileged callers on idmapped btrfs change. The RO-fd note in the > comment above is about the file descriptor, not this inode check, and > is unaffected. > > Signed-off-by: Tao Cui Fixes: 4609e1f18e19 ("fs: port ->permission() to pass mnt_idmap") Otherwise looks good to me. Reviewed-by: Qu Wenruo > --- > fs/btrfs/ioctl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > index 72bc9d4f7708..607329dedd50 100644 > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -2458,7 +2458,7 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) > * running and allows defrag on files open in read-only mode. > */ > if (!capable(CAP_SYS_ADMIN) && > - inode_permission(&nop_mnt_idmap, inode, MAY_WRITE)) { > + inode_permission(file_mnt_idmap(file), inode, MAY_WRITE)) { > ret = -EPERM; > goto out; > }