From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 A9EA786340 for ; Sat, 25 Oct 2025 10:22:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761387734; cv=none; b=dkobmg25yncFWs406qGneITG0XuScXQK3tOjmG0bdiW7nVl3UF0eAszO4/NvabcfI8k0iJXbo4l8ksf+91yfHl7y3i60pEUMSvUGKN6sxZVnOtS8kKtEocdo7EnbJJvGt+TdM9OgPhYfJR8OWmkJoGGHlejNGp20byrlAa+3nKE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761387734; c=relaxed/simple; bh=44pTS+lBoqxlTHc5dDQxB8Mc8BXXxf4gPiq3GBcKnwE=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=ClmTl+SKpqD24lNWr4NSeZAE6pBrtfGuCfgxtJ2F/ZgIIjOV+yNKbJL/nGM/xvnm+IKUZGCx+p+b+DAAjnVpzwZghM3pWvmH+PIEuBoCKSIil8BAuFUBLaq4YTqx4RfAeyvBeAqvgsZoJwvpnfSM1iNWiyrwExBzJ3oDIq7rZJg= 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=E+LGOFVJ; arc=none smtp.client-ip=209.85.128.46 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="E+LGOFVJ" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4711b95226dso33277665e9.0 for ; Sat, 25 Oct 2025 03:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1761387731; x=1761992531; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=4fNjxfMWJNNamEIJToaAFCvp9NaiazS8H8Vb/xpPvlo=; b=E+LGOFVJ3D+BIYXqYAEhLyecx+ucfN0i6BCRQ8wVySryjnAASjCf8xB7kw3lI/lOkb 5MhNSHFxrPh6kBl33Cv7yXiN5ECQtvhJj42t23AeKHRSsoapcBIWrLNNC2dudFC6Db9M IAChdkEn7LH5kcVH1Q3v3ND1w5i7txcYsjaygnA4MIdGDkzS78XGqNtTSBwgka/14E1G oZFUXRloXwq1KZZ4rjO0XznbTCw79IPe6BqtQqTltcssxDoTkS4ntoXM8iCRHxFQO5P7 6BNL/qc9hnCW2etrsAXMS/w/22+NPLeFmhvjLCemUYSx1m9NBBxqO9nNsO3PLwgRVmC1 7nMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761387731; x=1761992531; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4fNjxfMWJNNamEIJToaAFCvp9NaiazS8H8Vb/xpPvlo=; b=l1kaX8fBUdt8Z2r71oKD6svjfNPpbnJQ6KkHcbUjWgW4VCNTUpF3ukt6MiJIUmaAKP CogcqDj3hILNDBe45CGxtRPLtGVIFd0Vw13NEJztWTvZrmRle60gOitDPjYIvbcv6+Xt JXHD2A/Xb7iHxI2oYbsw78POEadCXRI/f5ZGJH1kFY/+EdUhXTrzbNh8PWmFi+UcK5fy YR1hIhm2kf4SZbjYhboIyARQjWG1DL5C0edoK+PzfEutHAneCzQGuxPKh799BMNjdgpu ChLeAo8OkaBUZYR8R15YHzvybtOtqCLKr0e6XOoCRg6uX6DGhbzX11tBVTe6weDij6UN 7bDA== X-Forwarded-Encrypted: i=1; AJvYcCX0Yzozw1YpZPqMQE2JBytPjPBUp/ckrAP2yxUc8JNfh/zfSTMy+/VsZnQrpbzN3GzVXro57QAe9Gf/JQ==@vger.kernel.org X-Gm-Message-State: AOJu0YxHymRgbLiQA2RixjdIxLqbf0BSSJbNHjT++OBom/iDBGUPOqkZ CtxTBkrf1kh+l/cnFos8+IkPfXi7H2PhSx2tUd1x5GSNISzHr0W6D718O6YQyjdI83o= X-Gm-Gg: ASbGncsfGpvVC/N3St1v+SJzx7eeF+EgE0i+AFAK8xR25hl854rDlJZF6th8JqsjlDJ zQAgaCxfTbkXvb3+2wfI7Vt5VZzDWHzFdWqMfTOB+zQXPO2n/lz/87nMwo4LMdL/bvratUvl5PG F7A9kD5W5N8iVIXuFEXX2tLkoVNATY2oLb5t/orId2KrHknA0O9z4AxKzWRrc7iEeXQkllE6gQJ kgKcFKCBRkS5Wmt4xOe7WEMAElfsSfVcu/vDdVDPBxdaJjYWDKu2punI1/yfoDD3YD0FW8YWItR /EUPgpbopLjFkeW6QYHjvFx+RH+OS2CEiS1evYSWXHNWm/et7/lCs6nx4K42AR3j59vhxYg3iPS BAN4fbxwubb06oBW0o5v8/J1a5Lq+iKFvz2alOwGqKAGCTz4FKoe/oobHPSFGkn3m7TJCE0NElS U2S9TNgGF804PH2p555LqoU2GRE0NI1xYHJYEVJ+o= X-Google-Smtp-Source: AGHT+IFrRxk+C6wSHlbHaOxVcqR25VztJE49+0+uc5Xnc3VjIYEkEx4tX2MW8hPdqM+0e1ldKjJGBA== X-Received: by 2002:a05:600c:444d:b0:46e:4cd3:7d54 with SMTP id 5b1f17b1804b1-471178b124amr218578665e9.18.1761387730780; Sat, 25 Oct 2025 03:22:10 -0700 (PDT) Received: from ?IPV6:2403:580d:fda1::299? (2403-580d-fda1--299.ip6.aussiebb.net. [2403:580d:fda1::299]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29498cf423esm18818645ad.19.2025.10.25.03.22.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 25 Oct 2025 03:22:10 -0700 (PDT) Message-ID: Date: Sat, 25 Oct 2025 20:52:06 +1030 Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH fs/btrfs] btrfs: fix memory leak of qgroup_list in btrfs_add_qgroup_relation From: Qu Wenruo To: Shardul Bankar , linux-btrfs@vger.kernel.org Cc: clm@fb.com, dsterba@suse.com, linux-kernel@vger.kernel.org References: <20251025092951.2866847-1-shardulsb08@gmail.com> <293c10e8-fa6b-4da2-8d7d-9eaf6b4ecd4b@suse.com> Content-Language: en-US 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: <293c10e8-fa6b-4da2-8d7d-9eaf6b4ecd4b@suse.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 在 2025/10/25 20:36, Qu Wenruo 写道: > > > 在 2025/10/25 19:59, Shardul Bankar 写道: >> When btrfs_add_qgroup_relation() is called with invalid qgroup levels >> (src >= dst), the function returns -EINVAL directly without freeing the >> preallocated qgroup_list structure passed by the caller. This causes a >> memory leak because the caller unconditionally sets the pointer to NULL >> after the call, preventing any cleanup. >> >> The issue occurs because the level validation check happens before the >> mutex is acquired and before any error handling path that would free >> the prealloc pointer. On this early return, the cleanup code at the >> 'out' label (which includes kfree(prealloc)) is never reached. >> >> In btrfs_ioctl_qgroup_assign(), the code pattern is: >> >>      prealloc = kzalloc(sizeof(*prealloc), GFP_KERNEL); >>      ret = btrfs_add_qgroup_relation(trans, sa->src, sa->dst, prealloc); >>      prealloc = NULL;  // Always set to NULL regardless of return value >>      ... >>      kfree(prealloc);  // This becomes kfree(NULL), does nothing >> >> When the level check fails, 'prealloc' is never freed by either the >> callee or the caller, resulting in a 64-byte memory leak per failed >> operation. This can be triggered repeatedly by an unprivileged user >> with access to a writable btrfs mount, potentially exhausting kernel >> memory. >> >> Fix this by changing the early return to a goto that reaches the >> cleanup code, ensuring prealloc is always freed on all error paths. >> >> Reported-by: BRF (btrfs runtime fuzzer) And forgot to mention, if this is some tool that has sent a report to the mailing list, please add a "Link:" tag. If it's only something internal to your organization/project, please remove this line, it makes no sense for upstream. Thanks, Qu >> Fixes: 8465ecec9611 ("btrfs: Check qgroup level in kernel qgroup >> assign.") >> Signed-off-by: Shardul Bankar >> --- >>   fs/btrfs/qgroup.c | 6 ++++-- >>   1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c >> index 1175b8192cd7..0a25bfdd442f 100644 >> --- a/fs/btrfs/qgroup.c >> +++ b/fs/btrfs/qgroup.c >> @@ -1539,8 +1539,10 @@ int btrfs_add_qgroup_relation(struct >> btrfs_trans_handle *trans, u64 src, u64 dst >>       ASSERT(prealloc); >>       /* Check the level of src and dst first */ >> -    if (btrfs_qgroup_level(src) >= btrfs_qgroup_level(dst)) >> -        return -EINVAL; >> +    if (btrfs_qgroup_level(src) >= btrfs_qgroup_level(dst)) { >> +        ret = -EINVAL; >> +        goto out; >> +    } > > Out will call mutex_unlock(), but we haven't yet even locked the mutex. > > Please just call kfree(prealloc) then return. > > Thanks, > Qu > >>       mutex_lock(&fs_info->qgroup_ioctl_lock); >>       if (!fs_info->quota_root) { > >