From patchwork Tue Apr 24 09:33:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kodanev X-Patchwork-Id: 903331 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="unbXUkM0"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40VdFS47NYz9s02 for ; Tue, 24 Apr 2018 19:24:28 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 3A3343E67B5 for ; Tue, 24 Apr 2018 11:24:25 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id 8B7C93E672D for ; Tue, 24 Apr 2018 11:24:22 +0200 (CEST) Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 70B9620004C for ; Tue, 24 Apr 2018 11:24:21 +0200 (CEST) Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w3O9H1bp007071; Tue, 24 Apr 2018 09:24:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=64DsDlMRyBJFeatuH8uwzFpi5HjqOvdCPTNf0xdeVkI=; b=unbXUkM0WQGUAD9BClmBVJnD41nGzQ5DXW1TdVQ9CMHE5bKud8CLXVvVhQ6WwjkO3kFV wp8kv+Nq3QnOIH0GQkCFeHqnmelAIjuNvOK/LFP88nqqpzsUQGhxKL2EonizLxSoVnpt XSeLRGL14fVxQXAXZWKDZyeP1F326jJdDR5+g45yOZufxZu6HLYT0hqD5LkeB5lzT3UW frUhY0AxMTQakF8Q1ir4okRWAz+eaVKV1U962UH4DPN9P4EL4IWA1iEb9NFg+2tn6z6x d9x7NQ8y61hMY9oMgOz8wBamAuUeGWnRwyxP5ZarTraSQir1E63rgEvWIKmc+tjntkvs 4Q== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2120.oracle.com with ESMTP id 2hfwy9h24j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Apr 2018 09:24:14 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w3O9OD83002050 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Apr 2018 09:24:13 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w3O9ODFH025669; Tue, 24 Apr 2018 09:24:13 GMT Received: from ak.ru.oracle.com (/10.162.80.29) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 24 Apr 2018 02:24:12 -0700 From: Alexey Kodanev To: ltp@lists.linux.it Date: Tue, 24 Apr 2018 12:33:46 +0300 Message-Id: <1524562426-13008-2-git-send-email-alexey.kodanev@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1524562426-13008-1-git-send-email-alexey.kodanev@oracle.com> References: <1524562426-13008-1-git-send-email-alexey.kodanev@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8872 signatures=668698 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1804240091 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH 2/2] sctp_big_chunk: make INIT packet in the test X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Since creating many different IP addresses and binding them to the same SCTP socket is a time consuming process, prepare SCTP INIT chunk in the test. Signed-off-by: Alexey Kodanev --- runtest/cve | 1 - testcases/network/sctp/sctp_big_chunk.c | 98 ++++++++++++++++++++++++++----- 2 files changed, 84 insertions(+), 15 deletions(-) diff --git a/runtest/cve b/runtest/cve index 1d9569a..2f4171c 100644 --- a/runtest/cve +++ b/runtest/cve @@ -33,4 +33,3 @@ cve-2017-17052 cve-2017-17052 cve-2017-16939 cve-2017-16939 cve-2017-17053 cve-2017-17053 cve-2018-5803 sctp_big_chunk -cve-2018-5803_2 sctp_big_chunk -a 10000 diff --git a/testcases/network/sctp/sctp_big_chunk.c b/testcases/network/sctp/sctp_big_chunk.c index 55a2969..02b8aa0 100644 --- a/testcases/network/sctp/sctp_big_chunk.c +++ b/testcases/network/sctp/sctp_big_chunk.c @@ -24,12 +24,14 @@ #include #include #include +#include +#include #include #include -#include #include "tst_test.h" #include "tst_safe_stdio.h" +#include "tst_checksum.h" #include "lapi/netinet_in.h" #include "lapi/socket.h" #include "lapi/sctp.h" @@ -38,6 +40,8 @@ static int port; static int sfd, cfd; static struct sockaddr_in6 rmt, loc; +static uint8_t packet[IP_MAXPACKET]; +static int pkt_len; static char *addr_param; static int addr_num = 3273; @@ -53,28 +57,91 @@ static void setup_server(void) tst_res(TINFO, "sctp server listen on %d", port); SAFE_LISTEN(sfd, 1); + + srand(port); } -static void setup_client(void) +static void update_packet_field(int *off, void *buf, int buf_len) { - struct sockaddr_in6 addr_buf[addr_num]; - int i; + memcpy(packet + *off, buf, buf_len); + *off += buf_len; +} - cfd = SAFE_SOCKET(AF_INET6, SOCK_STREAM, IPPROTO_SCTP); +static void setup_client(void) +{ + struct ip6_hdr ip6; + int ip6_hdr_len = sizeof(ip6); + int cmn_hdr_off; + int off, i; + + memset(&ip6, 0, sizeof(ip6)); + ip6.ip6_flow = htonl(6 << 28 | 2 << 20); + ip6.ip6_hops = 64; + ip6.ip6_nxt = IPPROTO_SCTP; + ip6.ip6_src.s6_addr[15] = 1; + ip6.ip6_dst.s6_addr[15] = 1; rmt.sin6_family = AF_INET6; rmt.sin6_addr = in6addr_loopback; - rmt.sin6_port = htons(port); - tst_res(TINFO, "bind %d additional IP addresses", addr_num); + /* SCTP common header */ + off = ip6_hdr_len; + + uint16_t src_port = htons(port - 1); + uint16_t dst_port = htons(port); + uint32_t vtag = 0; + uint32_t checksum = 0; + + update_packet_field(&off, &src_port, 2); + update_packet_field(&off, &dst_port, 2); + update_packet_field(&off, &vtag, 4); + update_packet_field(&off, &checksum, 4); + cmn_hdr_off = off; + + /* SCTP INIT chunk */ + uint16_t chunk_len; + + packet[off++] = 1; + packet[off++] = 0; + off += 2; /* chunk length, will be set in the end */ - memset(addr_buf, 0, sizeof(addr_buf)); + uint32_t init_tag = rand(); + uint32_t rwnd = htonl(106496); + uint16_t outs = htons(10); + uint16_t ins = htons(65535); + uint32_t init_tsn = rand(); + + update_packet_field(&off, &init_tag, 4); + update_packet_field(&off, &rwnd, 4); + update_packet_field(&off, &outs, 2); + update_packet_field(&off, &ins, 2); + update_packet_field(&off, &init_tsn, 4); + + /* SCTP optional parameter for IPv6 addresses */ + uint16_t param_type = htons(6); + uint16_t param_len = htons(20); + + /* IPv6 (40) + SCTP_BASE (12) + SCTP_CHUNK(20) + SCTP_OPT(65460)) */ for (i = 0; i < addr_num; ++i) { - addr_buf[i].sin6_family = AF_INET6; - addr_buf[i].sin6_addr = in6addr_loopback; + update_packet_field(&off, ¶m_type, 2); + update_packet_field(&off, ¶m_len, 2); + packet[off + 15] = 1; + off += 16; } + pkt_len = off; + + tst_res(TINFO, "set chunk length %d", pkt_len - cmn_hdr_off); + chunk_len = htons(pkt_len - cmn_hdr_off); + memcpy(packet + cmn_hdr_off + 2, &chunk_len, 2); + + /* set checksum for SCTP: common header + INIT chunk */ + uint32_t csum = crc32c(packet + ip6_hdr_len, pkt_len - ip6_hdr_len); - SAFE_SETSOCKOPT(cfd, SOL_SCTP, SCTP_SOCKOPT_BINDX_ADD, addr_buf, - sizeof(addr_buf)); + memcpy(packet + ip6_hdr_len + 8, &csum, 4); + + ip6.ip6_plen = htons(pkt_len - ip6_hdr_len); + memcpy(packet, &ip6, ip6_hdr_len); + + cfd = SAFE_SOCKET(AF_INET6, SOCK_RAW, IPPROTO_RAW); } static void setup(void) @@ -89,6 +156,7 @@ static void setup(void) static void run(void) { int pid = SAFE_FORK(); + int i; if (!pid) { struct sockaddr_in6 addr6; @@ -99,8 +167,10 @@ static void run(void) exit(0); } - fcntl(cfd, F_SETFL, O_NONBLOCK); - connect(cfd, (struct sockaddr *)&rmt, sizeof(rmt)); + for (i = 0; i < 3; ++i) { + SAFE_SENDTO(1, cfd, packet, pkt_len, 0, + (struct sockaddr *)&rmt, sizeof(rmt)); + } SAFE_KILL(pid, SIGKILL); SAFE_WAITPID(pid, NULL, 0);