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;
From:   Qing Wang <wangqing@vivo.com>
To:     "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <kafai@fb.com>,
        Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>, netdev@vger.kernel.org,
        bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Qing Wang <wangqing@vivo.com>
Subject: [PATCH V2] net: bpf: switch over to memdup_user()
Date:   Mon, 18 Oct 2021 04:30:48 -0700
Message-Id: <1634556651-38702-1-git-send-email-wangqing@vivo.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Vju7zFr3rcn8+DJvIMk02a2Ruuf91tEZdYqKKUUZ5rB9KBt2PmLdYGGxhXax?=
 =?us-ascii?Q?YNVGb+Fe3fzokn8qTYFygK04Ngfw5MJTPrhUjXw+n+yMVak17GDU5ofvo2a2?=
 =?us-ascii?Q?dS81J+WQ/GhFLXCkpKrGN2h4S/nXR38LjZuXD4BhKalye9NdILc4SyiknBmC?=
 =?us-ascii?Q?gaJYZ/E601JY7R7uZD8+ZJSN8G9HlSWFynJ1GOD8XRfAA6CAisUaQGYTMrAZ?=
 =?us-ascii?Q?B7YpmWOktvdtyATf3z7IC23p0exdcpKftMNYcKpy+3p6d5i5nFPh+17pPfQs?=
 =?us-ascii?Q?VBkbBSVI5lmXzjB1pfdVYbX8BpotccmNTeUwpmprfazPRNpTKIMbg7aERCCJ?=
 =?us-ascii?Q?dzpyRTU8xEf/udMLKdzsVAuQcZAnfyy1t/OB0cJyeR3+YeBIhb7W2XmovC7F?=
 =?us-ascii?Q?YwZ6lsaZEaUHW+7ubgPiaTdyzyveeD+hLv3ZB5oi9clVoAiPB4Df6QY/6s/f?=
 =?us-ascii?Q?PkMqm0Zw8itCeiETOJXh7Z8ZkKrYmOkDVGnQjV94hkf75iVpU/0jX30QgaRx?=
 =?us-ascii?Q?lgLzSha+QAV5rksBkDnWF6RhuTUL1OLIHy3DrEHfNTvOF93dU5EgFNKwjpSU?=
 =?us-ascii?Q?UISWoGbDsFOmuSjVlHZY1iiMMt54u37FTJVdyrGFAJSdjgCvcS6f+KED95xG?=
 =?us-ascii?Q?rgTnK1xCx39Wy7bri27CvglBvnmhK0dK+vg6/J5plVlBCz9q+V05mmO2EmhU?=
 =?us-ascii?Q?ilMKW9Wv8uUjFRRWN0W54ToL3oST431okBan3hoxyaGG2rInZhC6o4s793pl?=
 =?us-ascii?Q?PqhcQsTuJNvfBwsYecD+4ayDW/RDdJ+xQYYCdSInbyhnUUqtty9+id6TRC8X?=
 =?us-ascii?Q?YjvxGJuMlmDgHy2V+ugmXpFV0bGg6z0WFxumP95Wosm9ol/y2jeuieVELBll?=
 =?us-ascii?Q?BqNX9ChkZl4gT7tP56YEJI+WXL4PW8A0GA2IrxpKJj4GNuplhQKNyz0mtNmi?=
 =?us-ascii?Q?bWvD1E3W1Ofud3alC623nPb9ldhEAei3WVvVp0ScYkct5M18e+TKkviCecaj?=
 =?us-ascii?Q?mrq/9WUy26dSrv4XZUPJa6jJK+OUUjeOAFl1IXanpmEyxOO/tN72ZvfUUAIy?=
 =?us-ascii?Q?xF6/X8w+hyWwMuMQwzq0UegmLwEtZRQ5k3mctcMWO1lTxh3jzNEW8kH8QVSp?=
 =?us-ascii?Q?PZxy82adG5gCYkuFgQTjpZjaysOEllAWLL8yylOwywVRsMj8T+euUnqgCZQz?=
 =?us-ascii?Q?Hf//XheXokzXZ7E2tWj3KbIbwVqwOa/sWqhEgIfC4SB34ndzRVJbw8fyLLwQ?=
 =?us-ascii?Q?UG2cOCqKUhh4tvvfxaRaHiY3I14ibF1K7DjFabhhafDLVZZIPgmGiXh+cARq?=
 =?us-ascii?Q?ceUh/cy/sdypr98dCasMZpCt?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 235f7320-2875-4233-7138-08d9922ac1d8
X-MS-Exchange-CrossTenant-AuthSource: SL2PR06MB3082.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 11:30:59.0223
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wpBYFFVt3oTpFLx7uwjVKm79WlMQgqU1HOU2qPkNQ20DccgLjwchlFSTAGPwu7Bbgoetz2InuofHRQ3/8hSqWg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SL2PR06MB2986
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This patch fixes the following Coccinelle warning:

net/bpf/test_run.c:361:8-15: WARNING opportunity for memdup_user
net/bpf/test_run.c:1055:8-15: WARNING opportunity for memdup_user

Use memdup_user rather than duplicating its implementation
This is a little bit restricted to reduce false positives

Signed-off-by: Qing Wang <wangqing@vivo.com>
---
 net/bpf/test_run.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index 5296087..fbda8f5
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -358,13 +358,9 @@ int bpf_prog_test_run_raw_tp(struct bpf_prog *prog,
 		return -EINVAL;
 
 	if (ctx_size_in) {
-		info.ctx = kzalloc(ctx_size_in, GFP_USER);
-		if (!info.ctx)
-			return -ENOMEM;
-		if (copy_from_user(info.ctx, ctx_in, ctx_size_in)) {
-			err = -EFAULT;
-			goto out;
-		}
+		info.ctx = memdup_user(ctx_in, ctx_size_in);
+		if (IS_ERR(info.ctx))
+			return PTR_ERR(info.ctx);
 	} else {
 		info.ctx = NULL;
 	}
@@ -392,7 +388,6 @@ int bpf_prog_test_run_raw_tp(struct bpf_prog *prog,
 	    copy_to_user(&uattr->test.retval, &info.retval, sizeof(u32)))
 		err = -EFAULT;
 
-out:
 	kfree(info.ctx);
 	return err;
 }
@@ -1052,13 +1047,9 @@ int bpf_prog_test_run_syscall(struct bpf_prog *prog,
 		return -EINVAL;
 
 	if (ctx_size_in) {
-		ctx = kzalloc(ctx_size_in, GFP_USER);
-		if (!ctx)
-			return -ENOMEM;
-		if (copy_from_user(ctx, ctx_in, ctx_size_in)) {
-			err = -EFAULT;
-			goto out;
-		}
+		ctx = memdup_user(ctx_in, ctx_size_in);
+		if (IS_ERR(ctx))
+			return PTR_ERR(ctx);
 	}
 
 	rcu_read_lock_trace();
-- 
2.7.4