From patchwork Thu Nov 10 08:56:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban Crequy X-Patchwork-Id: 18018 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp28739wru; Thu, 10 Nov 2022 00:58:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf7efwBL1gOO91wvJFdNuK3QajRRtsQo8wKXibZCg+0yEk9Q0Fvoh63pKU7tWLtQd9rXCECe X-Received: by 2002:a17:902:f687:b0:188:6cce:671b with SMTP id l7-20020a170902f68700b001886cce671bmr29177475plg.71.1668070705220; Thu, 10 Nov 2022 00:58:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668070705; cv=none; d=google.com; s=arc-20160816; b=OMc9eCrNWABzBxYjWmOG2SLiTalAMPl6dNgSm1LZhtJbPDDy3DFFhujBYpbFiDqDss LF4O5FHCNDXH2yBfdSr/H2EsXeKQuGf8zsoQTj/UrI0LNI9NGWePJdbJJ1P1wxupy24Y 2zFVlfmT5CLaOQX93D9HdgLpd/DKcL/VUv3dGQsln2f9hnV6I+T+HlMlGGEk8I7Wgtxu mMdG+0fR021Ippa0BO+U8qFAgkllJch0Q9zii/vc/gEHbcTgD/7ceqNZ5JLvL87Rl7bJ sdQ8JS76xK9M+WJbirn9FFNCZ8/kjmtQW/Za/gG47MtmaIIR0+oVe4ASPwpd5lBQC33i ML4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=szRQl4NOiVgJGz/y76Fur+iBXK/NfJEkjgmsWKFSiWU=; b=raogMdqx2eYRsKUZdQYhBUfGAPWO9ae7reJGavmwFapqJg4fyyaJzgRPXUMRcD07UR YI76tqbgx2wzR12rbQInS7VtCd3SI1AsBsNDyc0izjI1FDuW78PPphK/bXFH1fSd1zf8 qv4W0qdWz+CaPcHoIdmJXgBkWkYrwCO5CutB8PAcNGRg373fEz27VcPEnoWH5j4+y2aL wg883LwPb7t32m0KCEKiqmiT1eahK9VnPxZ2xg/rVkqFi86n929/f73dbKYxE7C/Hzde uA4iRA8HhAOhuVKuNTMgn0e+89JxdWzsLJKWSptf212VmybfYc/Iuzq+n7srU8rkjrB9 Tfbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=nrXGpymq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j9-20020a63cf09000000b004600f27528fsi22198126pgg.175.2022.11.10.00.58.10; Thu, 10 Nov 2022 00:58:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=nrXGpymq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229674AbiKJI44 (ORCPT + 99 others); Thu, 10 Nov 2022 03:56:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229595AbiKJI4t (ORCPT ); Thu, 10 Nov 2022 03:56:49 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BC76A43875; Thu, 10 Nov 2022 00:56:48 -0800 (PST) Received: from neptune.. (ip5f592f1a.dynamic.kabel-deutschland.de [95.89.47.26]) by linux.microsoft.com (Postfix) with ESMTPSA id 2A82320B9F82; Thu, 10 Nov 2022 00:56:43 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 2A82320B9F82 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1668070608; bh=szRQl4NOiVgJGz/y76Fur+iBXK/NfJEkjgmsWKFSiWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nrXGpymqs4ouMJ0nRcC5r7dkMpIZK+4Vz2xiNtVc4FvCc7uU66XPckJEsAR2L2gbT yOKfI4o9Xz79KBhBz/hvhHlC9uWmr0uTEOYmUBnaCJeYif1Z/aH4DsEWIcHdsQxH5Y tqaUGVL0KodUOZn1Q4EI5XbphCHbF/q61DfvyENo= From: Alban Crequy To: bpf@vger.kernel.org Cc: stable@vger.kernel.org, albancrequy@linux.microsoft.com, flaniel@linux.microsoft.com, akpm@linux-foundation.org, andrii@kernel.org, ast@kernel.org, daniel@iogearbox.net, haoluo@google.com, john.fastabend@gmail.com, jolsa@kernel.org, kpsingh@kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, martin.lau@linux.dev, mykolal@fb.com, sdf@google.com, shuah@kernel.org, song@kernel.org, yhs@fb.com Subject: [PATCH bpf v2 2/2] selftests: bpf: add a test when bpf_probe_read_kernel_str() returns EFAULT Date: Thu, 10 Nov 2022 09:56:14 +0100 Message-Id: <20221110085614.111213-3-albancrequy@linux.microsoft.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221110085614.111213-1-albancrequy@linux.microsoft.com> References: <20221110085614.111213-1-albancrequy@linux.microsoft.com> MIME-Version: 1.0 X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749098908200305384?= X-GMAIL-MSGID: =?utf-8?q?1749098908200305384?= This commit tests previous fix of bpf_probe_read_kernel_str(). The BPF helper bpf_probe_read_kernel_str should return -EFAULT when given a bad source pointer and the target buffer should only be modified to make the string NULL terminated. bpf_probe_read_kernel_str() was previously inserting a NULL before the beginning of the dst buffer. This test should ensure that the implementation stays correct for now on. Without the fix, this test will fail as follows: $ cd tools/testing/selftests/bpf $ make $ sudo ./test_progs --name=varlen ... test_varlen:FAIL:check got 0 != exp 66 Signed-off-by: Alban Crequy Signed-off-by: Francis Laniel Acked-by: Yonghong Song Changes v1 to v2: - add ack tag - fix my email - rebase on bpf tree and tag for bpf tree --- tools/testing/selftests/bpf/prog_tests/varlen.c | 7 +++++++ tools/testing/selftests/bpf/progs/test_varlen.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/varlen.c b/tools/testing/selftests/bpf/prog_tests/varlen.c index dd324b4933db..4d7056f8f177 100644 --- a/tools/testing/selftests/bpf/prog_tests/varlen.c +++ b/tools/testing/selftests/bpf/prog_tests/varlen.c @@ -63,6 +63,13 @@ void test_varlen(void) CHECK_VAL(data->total4, size1 + size2); CHECK(memcmp(data->payload4, exp_str, size1 + size2), "content_check", "doesn't match!\n"); + + CHECK_VAL(bss->ret_bad_read, -EFAULT); + CHECK_VAL(data->payload_bad[0], 0x42); + CHECK_VAL(data->payload_bad[1], 0x42); + CHECK_VAL(data->payload_bad[2], 0); + CHECK_VAL(data->payload_bad[3], 0x42); + CHECK_VAL(data->payload_bad[4], 0x42); cleanup: test_varlen__destroy(skel); } diff --git a/tools/testing/selftests/bpf/progs/test_varlen.c b/tools/testing/selftests/bpf/progs/test_varlen.c index 3987ff174f1f..20eb7d422c41 100644 --- a/tools/testing/selftests/bpf/progs/test_varlen.c +++ b/tools/testing/selftests/bpf/progs/test_varlen.c @@ -19,6 +19,7 @@ __u64 payload1_len1 = 0; __u64 payload1_len2 = 0; __u64 total1 = 0; char payload1[MAX_LEN + MAX_LEN] = {}; +__u64 ret_bad_read = 0; /* .data */ int payload2_len1 = -1; @@ -36,6 +37,8 @@ int payload4_len2 = -1; int total4= -1; char payload4[MAX_LEN + MAX_LEN] = { 1 }; +char payload_bad[5] = { 0x42, 0x42, 0x42, 0x42, 0x42 }; + SEC("raw_tp/sys_enter") int handler64_unsigned(void *regs) { @@ -61,6 +64,8 @@ int handler64_unsigned(void *regs) total1 = payload - (void *)payload1; + ret_bad_read = bpf_probe_read_kernel_str(payload_bad + 2, 1, (void *) -1); + return 0; }