From nobody Wed Oct 8 00:41:25 2025 Received: from out-177.mta1.migadu.com (out-177.mta1.migadu.com [95.215.58.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44D06226D02 for ; Thu, 3 Jul 2025 16:38:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751560704; cv=none; b=ZDiHjz+GJCdZ/O9+8gUMPglTVkE/kJjwvGcxfkzISOt23DtAE2Mxox8HUPQYzUly9OE9ZHdi9G3zPS7+QvmIDIi/ZzfTwT9PvG4POCq6bSCC1JElcHRPhF4MX1PzU00q5XvE+NAk0F7aF1EqnHubsBwKu+d3UALjGv4KImJKB8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751560704; c=relaxed/simple; bh=tMw2h77EUdUJwSIctCdwYMpVl+/MG/Hi5H+pZeMOfOA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=oldg0IulqnqbtKKEon5IMicgwZ5Qzan4Bu6TRg1T8IOVrpIUxNyfczUXUqkl1odr8uAQCGqxCY4/ZExMQFfP4B71E6Jt2LFPicd+H2ZNScxRf64MoqYtr4XmcKL5fGk82C7R6ShZxQOeo/f3dytsLo2N61NnRk9/ZUmXyaBKDYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=k/3xGlcf; arc=none smtp.client-ip=95.215.58.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="k/3xGlcf" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1751560700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=lATfwAAqsGvlKdPeL43bykiRSCI9nUnpe0EI/piiyfw=; b=k/3xGlcfdUx1S1RdNT/zUK2XrQAqNy76uL61+jctA6W99xIl0hHimYJc/FaBgtkUEnGjHj KcQVPVU5zwRtThQ/bmf6HAFcdvuJaRSNka3OTCni0a0Glcm15jvwAZ/+BZZrU4DMxDIHXM kqGlonSUfdMtrYoWbObCdGpP+6RT9Mo= From: Tao Chen To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Tao Chen Subject: [PATCH bpf-next v2] bpf: Clean code with bpf_copy_to_user Date: Fri, 4 Jul 2025 00:37:00 +0800 Message-ID: <20250703163700.677628-1-chen.dylane@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" No logic change, just use bpf_copy_to_user to clean code. Signed-off-by: Tao Chen Acked-by: Yonghong Song --- kernel/bpf/syscall.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) Change list: v1 -> v2: - do not directly return when handle err ENOSPC.(Yonghong) v1: https://lore.kernel.org/bpf/20250703124336.672416-1-chen.dylane@linux.d= ev diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index e6eea594f1c..6ea3a8e3f7e 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -5208,21 +5208,10 @@ static int bpf_task_fd_query_copy(const union bpf_a= ttr *attr, =20 if (put_user(zero, ubuf)) return -EFAULT; - } else if (input_len >=3D len + 1) { - /* ubuf can hold the string with NULL terminator */ - if (copy_to_user(ubuf, buf, len + 1)) - return -EFAULT; } else { - /* ubuf cannot hold the string with NULL terminator, - * do a partial copy with NULL terminator. - */ - char zero =3D '\0'; - - err =3D -ENOSPC; - if (copy_to_user(ubuf, buf, input_len - 1)) - return -EFAULT; - if (put_user(zero, ubuf + input_len - 1)) - return -EFAULT; + err =3D bpf_copy_to_user(ubuf, buf, input_len, len); + if (err =3D=3D -EFAULT) + return err; } } =20 --=20 2.48.1