From patchwork Wed Jan 16 08:40:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vakul Garg X-Patchwork-Id: 1025693 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="GBdHM/vg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fgf83WzGz9sD9 for ; Wed, 16 Jan 2019 19:41:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389325AbfAPIlC (ORCPT ); Wed, 16 Jan 2019 03:41:02 -0500 Received: from mail-eopbgr80051.outbound.protection.outlook.com ([40.107.8.51]:64454 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729177AbfAPIlB (ORCPT ); Wed, 16 Jan 2019 03:41:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uHwzOLfP6QsxpFoAp6TuXQBpMM7w9d9qJ3GfMnnVgYM=; b=GBdHM/vgADqjIEtc6gJTBxomDn18c9Yo2ilPVoUpzozK+TiCsd+URqbmOAxjrbdYqwdLbY688TcXAtunJuX5MqezmfQmn3jRqs2KZO7mtIik1yQXW8U+/p+va9P2NMc9Qvfhsp6vhZbRIgKJ+0XFAb1EhmZqdRxHAdWrHO07IKw= Received: from DB7PR04MB4252.eurprd04.prod.outlook.com (52.135.131.26) by DB7PR04MB4474.eurprd04.prod.outlook.com (52.135.138.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Wed, 16 Jan 2019 08:40:58 +0000 Received: from DB7PR04MB4252.eurprd04.prod.outlook.com ([fe80::ddb0:738d:4c88:b3ed]) by DB7PR04MB4252.eurprd04.prod.outlook.com ([fe80::ddb0:738d:4c88:b3ed%4]) with mapi id 15.20.1516.019; Wed, 16 Jan 2019 08:40:58 +0000 From: Vakul Garg To: "netdev@vger.kernel.org" CC: "borisp@mellanox.com" , "aviadye@mellanox.com" , "davejwatson@fb.com" , "davem@davemloft.net" , "doronrk@fb.com" , Vakul Garg Subject: [PATCH net-next] selftests/tls: Fix recv partial/large_buff test cases Thread-Topic: [PATCH net-next] selftests/tls: Fix recv partial/large_buff test cases Thread-Index: AQHUrXczO42a7qohIE6M7I7Rhx/pCw== Date: Wed, 16 Jan 2019 08:40:58 +0000 Message-ID: <20190116083846.18081-1-vakul.garg@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MEAPR01CA0006.ausprd01.prod.outlook.com (2603:10c6:201:1::18) To DB7PR04MB4252.eurprd04.prod.outlook.com (2603:10a6:5:27::26) authentication-results: spf=none (sender IP is ) smtp.mailfrom=vakul.garg@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.13.6 x-originating-ip: [14.143.30.134] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR04MB4474; 6:yA2wCSKG/NxLzXv43xGAH84g7zR+tZgqiZNsxFjtVee2WLh9NG4Fe5gBBF+XZt0qdPbC6EnTfEKVGaS6RkesFQrY5YuwOZRseycOrSrugeLXbqNty0NUsd2rnGKYdo4Sk1+NxLf62+8nLIp9piPkC4zIZbEfEnyiu0xdoDtT2CvwWPrNTCWXbWi822NjQ2rXhXCFOjFrGlol6B63pANxrtI/hCBeozSy3PAmLcOoGly0dfKLBRjmlpBpVUxeH+sUNhjBEQXhfYuVD7IwZ0e3Nl71ACCqpW+CVcX7QYphYGMSY926ndBc7sf1YOQiMCBp6TbmMN427LAPDVmh3G5GX5hea8qF9C+oMg2eFIgQeviSWgBU3Alo2Pa+Rjdx+h/GH2uzzjG70L7w/QZh2YHptVwuoeFF+bRUIISr29cgOS0yUBCatiPFvzLqmMHknKadF0WaXameNTT5i+a/4NPRqA==; 5:HJOcci9j0/o+7Q1cMpdO+L1Db9lCbBlXYLVB1fVXygAEgGQI3WCRaL3wCxzu7tozE0ZuffB3BQI8IiKZSh7bLcp00469zcTz2KID/FOrYcssUrdDG5hvPIFhFUZwao6JcTZ3dFECaO2GeXx9XzkGj0R9bALpO14cs0La/x/JQKxGDTAhsnbu6Ymfe2zEhziBhu4GY5Fjih6HNqz7IWF1cA==; 7:ACy9VMxhJhbpvdfKm9ZE55x4jyq3JwOSeH75G3cCUJ20D5DNQlZJ6PpRAL7kJpPAN2m8tcKtBettszmknlL6IbrwmLpdW8Z0rP7JcZZDc0Fbj8eXkGikbMG6z0b/09pra/2ee7W7Qdj5fGUIEQZRuQ== x-ms-office365-filtering-correlation-id: 42f82950-f6d5-4de5-3d3c-08d67b8e55e7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR04MB4474; x-ms-traffictypediagnostic: DB7PR04MB4474: x-microsoft-antispam-prvs: x-forefront-prvs: 091949432C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(366004)(376002)(396003)(136003)(39860400002)(189003)(199004)(36756003)(8936002)(305945005)(86362001)(102836004)(478600001)(106356001)(105586002)(5660300001)(50226002)(2616005)(97736004)(2906002)(7736002)(1076003)(2501003)(68736007)(3846002)(6116002)(186003)(66066001)(1730700003)(81156014)(4326008)(44832011)(81166006)(54906003)(8676002)(316002)(78486014)(6512007)(386003)(486006)(53936002)(14454004)(99286004)(55236004)(6916009)(256004)(26005)(25786009)(5640700003)(476003)(6506007)(52116002)(2351001)(6436002)(6486002)(71200400001)(71190400001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB4474; H:DB7PR04MB4252.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 9LYL9exuYRKlYhjZeb/il3cAn8CelAPN7LbmHU2SyV+B8bvux0FCpTaC1HTz2yJGPis+xoPa/OyTXFXLAP+xg1AxPAW291gM0zlmiL6cdElAIMpDm3op7AEJLCn/Dtg3k5ODlwTU4OA9Hq4YbuREBzLw/euDglJK1aUiwDt3dNk80eLEtkUL4D/3X5x1UIWpauP326gMgvASfKostaO1EEBLFOZBaKQ1QMjnVi+W5+ANPJdFERMaUFbatrR/oHNvvn20buocUeHU/piOETUa8WIy7oeyPA+890+Aoj7NVDhw+qb9VhNXZsTuPAj7svtqcL8dFRpExhm1AyRDgiMcpBB4HPdHFUwkRfefdXMT6tjQNvDoCFQowQpoHy1TBYF132fD6VLs9ro/F896QrBwuNGSTjkM7FIZOcw7jRZglSY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42f82950-f6d5-4de5-3d3c-08d67b8e55e7 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Jan 2019 08:40:53.4503 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4474 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org TLS test cases recv_partial & recv_peek_large_buf_mult_recs expect to receive a certain amount of data and then compare it against known strings using memcmp. To prevent recvmsg() from returning lesser than expected number of bytes (compared in memcmp), MSG_WAITALL needs to be passed in recvmsg(). Signed-off-by: Vakul Garg --- tools/testing/selftests/net/tls.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c index fac68d710f35..ff68ed19c0ef 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -452,10 +452,12 @@ TEST_F(tls, recv_partial) memset(recv_mem, 0, sizeof(recv_mem)); EXPECT_EQ(send(self->fd, test_str, send_len, 0), send_len); - EXPECT_NE(recv(self->cfd, recv_mem, strlen(test_str_first), 0), -1); + EXPECT_NE(recv(self->cfd, recv_mem, strlen(test_str_first), + MSG_WAITALL), -1); EXPECT_EQ(memcmp(test_str_first, recv_mem, strlen(test_str_first)), 0); memset(recv_mem, 0, sizeof(recv_mem)); - EXPECT_NE(recv(self->cfd, recv_mem, strlen(test_str_second), 0), -1); + EXPECT_NE(recv(self->cfd, recv_mem, strlen(test_str_second), + MSG_WAITALL), -1); EXPECT_EQ(memcmp(test_str_second, recv_mem, strlen(test_str_second)), 0); } @@ -565,10 +567,10 @@ TEST_F(tls, recv_peek_large_buf_mult_recs) len = strlen(test_str_second) + 1; EXPECT_EQ(send(self->fd, test_str_second, len, 0), len); - len = sizeof(buf); + len = strlen(test_str) + 1; memset(buf, 0, len); - EXPECT_NE(recv(self->cfd, buf, len, MSG_PEEK), -1); - + EXPECT_NE((len = recv(self->cfd, buf, len, + MSG_PEEK | MSG_WAITALL)), -1); len = strlen(test_str) + 1; EXPECT_EQ(memcmp(test_str, buf, len), 0); }