From patchwork Wed Nov 28 00:10:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1004133 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=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cnqfQCme"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 434Lff6VQfz9s2P for ; Wed, 28 Nov 2018 11:11:22 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id BF970B5D; Wed, 28 Nov 2018 00:10:23 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 1EDBBAC7 for ; Wed, 28 Nov 2018 00:10:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D0455762 for ; Wed, 28 Nov 2018 00:10:20 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id q1so9224762pfi.5 for ; Tue, 27 Nov 2018 16:10:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xw8HrX0+zFlbJzJJmsGXjj7hdaL8txUSRuUp5wTlxS8=; b=cnqfQCmepEtZOrxvJkICysEO5oP5eN0VRiROGq+AvkYFKJ/Z37GE89tOOaG/gga9Zh oeRvqKh/mUYX3R9VSMRFFoL+8gM1to0pd2ifJyB/lcBSssJIkZDAGx+pRuA37YSIyvya v9aMGBCVkiVtqOtZNR+XvhXg3k24PUsLIf/tPXkiz3a+KncUBI2p0DHjlpVmnIS1GnXd 9+qvGXUtRwcMKo+NRO/6xOCYxXT/gcvzoC3Humft9W0F9KgDXNZsuYsaUrLOzLi4rEwg iqSN5vxtd4jccg+EQUOthMvVbkDPrVGUiUDpLwkEeqeFwf62Ei49lopRBzeoHiUB2v91 Rpvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Xw8HrX0+zFlbJzJJmsGXjj7hdaL8txUSRuUp5wTlxS8=; b=PDOv2rXBoJqvqLNoLJQGX6q15HVMCSTIX9Z4ipg9IJOejcQXqLc+Kh9bnsNWZEPUuP /nAlc5iFiP7yelu89sl3MNXa4laFPT5iozpd+1AXFiuOlU3LINOtwQzdGQMrUpdCq5r+ BJVKFHl/U2pSuiN/7jTUS6xXVLdtMpgNfRPTXfDsck/52d0O60UVP7xHuzaqmQvykVss XXH5341ixmv6Q5C30qzpYPBQZsVsxhnuBTyXJKhRJjU8JeI0e8VTvXgqUbBgYMeHQnbo PGVKtTCnj9l6SSZi5GWgKJZvR+htnc3m36DcEt4VR3yxDHa1fc9pipl7/wKBj/PJFzqZ dNvA== X-Gm-Message-State: AA+aEWZemXsQiaLFWbOIWSujZm3OQacQBPbtFglyfr8LqbEJkCeoGZVa MC6Tkr7qYF73dyvZ2tPqbDIlWeCb X-Google-Smtp-Source: AFSGD/W1w3QQsBOdOvFSee0B/5khCfut7qkjxvTG11R2CFojtHHOvKaCWqDXLw3FqtzfWqTpS/2/3Q== X-Received: by 2002:a62:6b85:: with SMTP id g127mr7960684pfc.42.1543363820267; Tue, 27 Nov 2018 16:10:20 -0800 (PST) Received: from kern417.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id r8sm5138870pgr.48.2018.11.27.16.10.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Nov 2018 16:10:19 -0800 (PST) From: Yifeng Sun To: dev@openvswitch.org Date: Tue, 27 Nov 2018 16:10:12 -0800 Message-Id: <1543363812-28116-3-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543363812-28116-1-git-send-email-pkusunyifeng@gmail.com> References: <1543363812-28116-1-git-send-email-pkusunyifeng@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] odp-util: Validate values of vid and pcp in push_vlan action X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Oss-fuzz complains that 'vid << VLAN_VID_SHIFT' is causing an error of "Undefined-shift in parse_odp_action". This is because an invalid value of vid is passed in push_vlan. This patch adds validation to the value of vid, in addition to the value of pcp. Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11520 Signed-off-by: Yifeng Sun --- lib/odp-util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/odp-util.c b/lib/odp-util.c index bb6669b37af9..1e8c5f194793 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -2282,6 +2282,10 @@ parse_odp_action(const char *s, const struct simap *port_names, &tpid, &vid, &pcp, &n) || ovs_scan(s, "push_vlan(tpid=%i,vid=%i,pcp=%i,cfi=%i)%n", &tpid, &vid, &pcp, &cfi, &n)) { + if ((vid & ~(VLAN_VID_MASK >> VLAN_VID_SHIFT)) != 0 + || (pcp & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT)) != 0) { + return -EINVAL; + } push.vlan_tpid = htons(tpid); push.vlan_tci = htons((vid << VLAN_VID_SHIFT) | (pcp << VLAN_PCP_SHIFT)