From patchwork Thu Mar 9 20:29:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 67090 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp505844wrd; Thu, 9 Mar 2023 12:37:32 -0800 (PST) X-Google-Smtp-Source: AK7set/uoJMfcwHyMyABoF5Qn2OPlGaLnS5+ienpxFwjJav4tTdip7akBEYiM7JsP/7oeDxVKmPT X-Received: by 2002:a17:902:c40d:b0:19c:d18d:950c with SMTP id k13-20020a170902c40d00b0019cd18d950cmr27728540plk.32.1678394252359; Thu, 09 Mar 2023 12:37:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678394252; cv=none; d=google.com; s=arc-20160816; b=pMbxEAIeaof/oTcFdSc8mBO162Lj08K635qUPSS85anGmVQRtAjBnWZNFc0Sm87vS+ uO2jZ/etst+Vfp4ED+92YjvhjUhgn4wNFJYG2AXXCd0Kofbk+6ZPzq4c2hBJThXBQfKf 4F8OjSYjFMfhVZdULYJs71uhE56JFUICOj4RhPR4LHc3EE2Oym0v02TO2P+QvY0heuy1 HaQUfi1XJuKXpK/SJ4dnOUsCUzXS1Yr7CVteJElfTwdkZy/EwOvYJDgxwmd9z8TvMP+2 S8L0azNpKR7Xs/Rc5XrR0qC6+e2amMJwJ8HmWoIvDr1MDB2+nvmKt0I4sdVNiv9DOYkH r/9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:subject:from:cc:to :in-reply-to:content-language:user-agent:mime-version:date :message-id:dkim-signature; bh=DzVarEVGLOGPMv/nEn7ynZtKJOLMh7bPhpvVeCziZKc=; b=Co5x3x4I8cyjep12mYQIvh1HEZ+U7AXvIuoCW2Jje2WuLQ4V5rJU/wtm5GgpqUeXm+ O99jBFx+y6UFEwYKt4F7rFIWzv8/5MES5EfYq5243IN5dJPHrHwVBXwd2S0n3Qc+IAU5 F34SGxJ8zIsbVb4Dt8ujiF4rb+BGIrdnI4QdVAIOfBEWD62r79do6BLDX+ASoL/mOLGO rHwzGzKPp+AoBX+GkNmpCutbFXMTQKCE6/HlopsPIHWns6tF3FZ113Puwd0NxJpfZgJY ZH1pnXYfxTm9AZJqniAcUvZ9mximfB3o8FA6g91OgpZcqtAL5RArNuBJnjNpK71Q2qv1 dRkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Kgbz3fWX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kj5-20020a17090306c500b0019ced5a540csi188186plb.370.2023.03.09.12.37.17; Thu, 09 Mar 2023 12:37:32 -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=@sberdevices.ru header.s=mail header.b=Kgbz3fWX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230449AbjCIUce (ORCPT + 99 others); Thu, 9 Mar 2023 15:32:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjCIUcb (ORCPT ); Thu, 9 Mar 2023 15:32:31 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AA0BF8662; Thu, 9 Mar 2023 12:32:29 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id EF88E5FD1B; Thu, 9 Mar 2023 23:32:27 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678393948; bh=DzVarEVGLOGPMv/nEn7ynZtKJOLMh7bPhpvVeCziZKc=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=Kgbz3fWXoyBscpDzEfSS/We+NAPlK0tAD1rnGNlNzdcamRRbY0kSgyLjbPvsrfxK2 DnaAkPZ7cSnm+Yxg1MrVPZTmpyW+gXjlGnhOYYMIbc/cMoSJqEvN0Ew55Fm/uFTDa4 31O/HRGNS8XpekXO2Uc+9Bm5sEcj2iHilq6iHI1hfrkbmThpkUcLYbpHq+UnyEznC4 5xbanPeggE34pRadVBab3U+mmb7w+/kGkHKDvkjg0fjCv0QBqbUS2x3gQ/NY7gkt6L rO1XmBqM+XWkn2wRrbuVIdE7AqL6McROAL0CaflhIRu6i+Bip3I+etGjXKdRH77rvB HNUybPT0voYOQ== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 9 Mar 2023 23:32:27 +0300 (MSK) Message-ID: Date: Thu, 9 Mar 2023 23:29:26 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US In-Reply-To: <1804d100-1652-d463-8627-da93cb61144e@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v4 4/4] test/vsock: copy to user failure test X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/09 18:14:00 #20929517 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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?1759923931729915776?= X-GMAIL-MSGID: =?utf-8?q?1759923931729915776?= This adds SOCK_STREAM and SOCK_SEQPACKET tests for invalid buffer case. It tries to read data to NULL buffer (data already presents in socket's queue), then uses valid buffer. For SOCK_STREAM second read must return data, because skbuff is not dropped, but for SOCK_SEQPACKET skbuff will be dropped by kernel, and 'recv()' will return EAGAIN. Reviewed-by: Stefano Garzarella Signed-off-by: Arseniy Krasnov --- tools/testing/vsock/vsock_test.c | 118 +++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c index 67e9f9df3a8c..3de10dbb50f5 100644 --- a/tools/testing/vsock/vsock_test.c +++ b/tools/testing/vsock/vsock_test.c @@ -860,6 +860,114 @@ static void test_stream_poll_rcvlowat_client(const struct test_opts *opts) close(fd); } +#define INV_BUF_TEST_DATA_LEN 512 + +static void test_inv_buf_client(const struct test_opts *opts, bool stream) +{ + unsigned char data[INV_BUF_TEST_DATA_LEN] = {0}; + ssize_t ret; + int fd; + + if (stream) + fd = vsock_stream_connect(opts->peer_cid, 1234); + else + fd = vsock_seqpacket_connect(opts->peer_cid, 1234); + + if (fd < 0) { + perror("connect"); + exit(EXIT_FAILURE); + } + + control_expectln("SENDDONE"); + + /* Use invalid buffer here. */ + ret = recv(fd, NULL, sizeof(data), 0); + if (ret != -1) { + fprintf(stderr, "expected recv(2) failure, got %zi\n", ret); + exit(EXIT_FAILURE); + } + + if (errno != ENOMEM) { + fprintf(stderr, "unexpected recv(2) errno %d\n", errno); + exit(EXIT_FAILURE); + } + + ret = recv(fd, data, sizeof(data), MSG_DONTWAIT); + + if (stream) { + /* For SOCK_STREAM we must continue reading. */ + if (ret != sizeof(data)) { + fprintf(stderr, "expected recv(2) success, got %zi\n", ret); + exit(EXIT_FAILURE); + } + /* Don't check errno in case of success. */ + } else { + /* For SOCK_SEQPACKET socket's queue must be empty. */ + if (ret != -1) { + fprintf(stderr, "expected recv(2) failure, got %zi\n", ret); + exit(EXIT_FAILURE); + } + + if (errno != EAGAIN) { + fprintf(stderr, "unexpected recv(2) errno %d\n", errno); + exit(EXIT_FAILURE); + } + } + + control_writeln("DONE"); + + close(fd); +} + +static void test_inv_buf_server(const struct test_opts *opts, bool stream) +{ + unsigned char data[INV_BUF_TEST_DATA_LEN] = {0}; + ssize_t res; + int fd; + + if (stream) + fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); + else + fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); + + if (fd < 0) { + perror("accept"); + exit(EXIT_FAILURE); + } + + res = send(fd, data, sizeof(data), 0); + if (res != sizeof(data)) { + fprintf(stderr, "unexpected send(2) result %zi\n", res); + exit(EXIT_FAILURE); + } + + control_writeln("SENDDONE"); + + control_expectln("DONE"); + + close(fd); +} + +static void test_stream_inv_buf_client(const struct test_opts *opts) +{ + test_inv_buf_client(opts, true); +} + +static void test_stream_inv_buf_server(const struct test_opts *opts) +{ + test_inv_buf_server(opts, true); +} + +static void test_seqpacket_inv_buf_client(const struct test_opts *opts) +{ + test_inv_buf_client(opts, false); +} + +static void test_seqpacket_inv_buf_server(const struct test_opts *opts) +{ + test_inv_buf_server(opts, false); +} + static struct test_case test_cases[] = { { .name = "SOCK_STREAM connection reset", @@ -920,6 +1028,16 @@ static struct test_case test_cases[] = { .run_client = test_seqpacket_bigmsg_client, .run_server = test_seqpacket_bigmsg_server, }, + { + .name = "SOCK_STREAM test invalid buffer", + .run_client = test_stream_inv_buf_client, + .run_server = test_stream_inv_buf_server, + }, + { + .name = "SOCK_SEQPACKET test invalid buffer", + .run_client = test_seqpacket_inv_buf_client, + .run_server = test_seqpacket_inv_buf_server, + }, {}, };