Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3198579pxu; Tue, 15 Dec 2020 00:44:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRQFvA9box1/vQGLt2QYOBvpf3M/fyZU1ESY7N/RwtufgbeutyUtkKK+dPrL2q2PECHKSc X-Received: by 2002:a50:eb44:: with SMTP id z4mr27871773edp.167.1608021886627; Tue, 15 Dec 2020 00:44:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608021886; cv=none; d=google.com; s=arc-20160816; b=GKrVSCYqDxqTbd19ZXZaJWKTzP+eRSawd7/NodJr6pxypGH9ekBuX8jFcSL4efL3dl H92I5j+yvlWgiMMuynVlraD+Apwf/1V0jNREVlZmoT+MvuuMr4CU7S6Olmy3WELdJ/u8 NhvbAk7/TEq1sy6mpnMFRVvkTaW4xnj7GjiBxjdbTt31WWZG8nDUdgHiHFJp9mSNVAyN 7XXW7ABaXsLgHTOvjIMhPvUhQKRSiqLn1z3T4Kr/F/C875BugaC1AqLFVwADZGDciNpz nzgI4aOI9eH0D47tX4OUtUKE+5FvyuQ71IrMXe841+6TBXa9+SpIwSmMZ29b53DoPORY BP5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:references:cc:to :subject; bh=CPnYgTXV1a26FvNyZ8ZQHDuIMJWO7sb8D8sJRpMfb8E=; b=aQSFJe0yVOxNAqQAtJZrXhlYs2ScR1mUu3jt/nSNRp0XJ1mYN98/S+UCnxQuo17CEp uYOg14cpZ3FXx5QexeVdCsJnopvJU/oM2K3w40+eIp3ajGOwEmHUkH+xECp5xJnzvz2a biSoxhlea7OgI4xqMn0RD2rm+MeU4Huhzcjr54v/onKeWjbWG6Z7Pi3OndgsLFz6rQ+c pMdlEYotpiJHjyD+MyY2Mo2dfZXZ6lzLo3WnN/JAJFAYEeh/ZZko0emu7dU6naf1xOvh IfHYZGrY0+L0VAR/+YCFfWRUD/4hkWaUPEsjQkGo4oH12wZ2JDZFZlx+dJvS4wNTDLMt kZiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e20si536033ejq.444.2020.12.15.00.44.23; Tue, 15 Dec 2020 00:44:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726985AbgLOIkI (ORCPT + 99 others); Tue, 15 Dec 2020 03:40:08 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:9608 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727135AbgLOIkC (ORCPT ); Tue, 15 Dec 2020 03:40:02 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CwBVY2fqmzM5T4; Tue, 15 Dec 2020 16:38:29 +0800 (CST) Received: from [10.174.179.9] (10.174.179.9) by smtp.huawei.com (10.3.19.204) with Microsoft SMTP Server (TLS) id 14.3.498.0; Tue, 15 Dec 2020 16:39:08 +0800 Subject: Re: [PATCH] cgroup: Fix memory leak when parsing multiple source parameters To: Qinglang Miao , Tejun Heo , Johannes Weiner CC: , References: <20201209121322.77665-1-miaoqinglang@huawei.com> From: Zefan Li Message-ID: Date: Tue, 15 Dec 2020 16:39:00 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20201209121322.77665-1-miaoqinglang@huawei.com> Content-Type: text/plain; charset="gbk" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.9] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/12/9 20:13, Qinglang Miao wrote: > A memory leak is found in cgroup1_parse_param() when multiple source > parameters overwrite fc->source in the fs_context struct without free. > > unreferenced object 0xffff888100d930e0 (size 16): > comm "mount", pid 520, jiffies 4303326831 (age 152.783s) > hex dump (first 16 bytes): > 74 65 73 74 6c 65 61 6b 00 00 00 00 00 00 00 00 testleak........ > backtrace: > [<000000003e5023ec>] kmemdup_nul+0x2d/0xa0 > [<00000000377dbdaa>] vfs_parse_fs_string+0xc0/0x150 > [<00000000cb2b4882>] generic_parse_monolithic+0x15a/0x1d0 > [<000000000f750198>] path_mount+0xee1/0x1820 > [<0000000004756de2>] do_mount+0xea/0x100 > [<0000000094cafb0a>] __x64_sys_mount+0x14b/0x1f0 > > Fix this bug by permitting a single source parameter and rejecting with > an error all subsequent ones. > > Fixes: 8d2451f4994f ("cgroup1: switch to option-by-option parsing") > Reported-by: Hulk Robot > Signed-off-by: Qinglang Miao > --- > kernel/cgroup/cgroup-v1.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c > index 191c329e4..1fd7d3d18 100644 > --- a/kernel/cgroup/cgroup-v1.c > +++ b/kernel/cgroup/cgroup-v1.c > @@ -908,6 +908,9 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) > opt = fs_parse(fc, cgroup1_fs_parameters, param, &result); > if (opt == -ENOPARAM) { > if (strcmp(param->key, "source") == 0) { > + if (fc->source) > + return invalf(fc, "Multiple sources not > + supported"); "never break user-visible strings such as printk messages because that breaks the ability to grep for them.", quoted from CodingStyle. Please fix this and you can add Reviewed-by: Zefan Li