From patchwork Mon Apr 20 19:25:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 68968 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D22FCA0561; Mon, 20 Apr 2020 21:25:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E134B1D6F0; Mon, 20 Apr 2020 21:25:43 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 2FA001C1B3 for ; Mon, 20 Apr 2020 21:25:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587410734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3FsCdEAv4hAfoBRJHfCHC2bs/sjMs+gh/OFmQBzGSyc=; b=QCwQzVYbjpInzr88GphcHxLMFakUb/yZYOfRqLPvuC8eu9Y9Tk2XaJGy0Ty33rEMXZ4b5o mpng4wl6xbZfjL7TVR/q24o3dg8S/eE7UkUcT5viPvGvUBFEf3l19Q3VZ/n8xblQpjhLw6 tpXvkOu6zvka+rO3yDev9JSA5KpfQrE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-algP1KSFPT2lguWwmZgYCA-1; Mon, 20 Apr 2020 15:25:31 -0400 X-MC-Unique: algP1KSFPT2lguWwmZgYCA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E529B1007275; Mon, 20 Apr 2020 19:25:29 +0000 (UTC) Received: from dhcp-25.97.bos.redhat.com (ovpn-114-167.rdu2.redhat.com [10.10.114.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id D41245C1BB; Mon, 20 Apr 2020 19:25:28 +0000 (UTC) From: Aaron Conole To: dev@dpdk.org Cc: Pavan Nikhilesh , Bruce Richardson , David Marchand , Ferruh Yigit , Anatoly Burakov , Lukasz Wojciechowski Date: Mon, 20 Apr 2020 15:25:21 -0400 Message-Id: <20200420192523.2546909-2-aconole@redhat.com> In-Reply-To: <20200420192523.2546909-1-aconole@redhat.com> References: <20200417131410.1343135-1-aconole@redhat.com> <20200420192523.2546909-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH v6 1/3] ip_frag: ensure minimum v4 fragmentation length X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Do a formal parameter check of mtu length, as well as checking the the various inputs for validity. If any aren't acceptable, we bail. Acked-by: Konstantin Ananyev Acked-by: Lukasz Wojciechowski Signed-off-by: Aaron Conole Acked-by: Lukasz Wojciechowski --- lib/librte_ip_frag/rte_ipv4_fragmentation.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c index 9e9f986cc5..e9de335ae2 100644 --- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c +++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "ip_frag_common.h" @@ -76,6 +77,15 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, uint16_t fragment_offset, flag_offset, frag_size; uint16_t frag_bytes_remaining; + /* + * Formal parameter checking. + */ + if (unlikely(pkt_in == NULL) || unlikely(pkts_out == NULL) || + unlikely(nb_pkts_out == 0) || + unlikely(pool_direct == NULL) || unlikely(pool_indirect == NULL) || + unlikely(mtu_size < RTE_ETHER_MIN_MTU)) + return -EINVAL; + /* * Ensure the IP payload length of all fragments is aligned to a * multiple of 8 bytes as per RFC791 section 2.3.