From patchwork Wed Sep 16 17:33:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1365656 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=hemlock.osuosl.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.a=rsa-sha256 header.s=20161025 header.b=WiaxUGHz; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BsJ7M28BgzB40h for ; Thu, 17 Sep 2020 10:41:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AFB6E874EC; Wed, 16 Sep 2020 17:34:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pKH1Pu-1FFnY; Wed, 16 Sep 2020 17:34:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 9D70E874DF; Wed, 16 Sep 2020 17:33:54 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 731F1C0893; Wed, 16 Sep 2020 17:33:54 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id BF8F9C0888 for ; Wed, 16 Sep 2020 17:33:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8C97286CB0 for ; Wed, 16 Sep 2020 17:33:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lYO9Q7y0XvZO for ; Wed, 16 Sep 2020 17:33:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4446286CFF for ; Wed, 16 Sep 2020 17:33:34 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id y1so4292329pgk.8 for ; Wed, 16 Sep 2020 10:33:34 -0700 (PDT) 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=XvcDbsZt7z2QbmWEL4H7AxvS3rT0TlpriYQwxl5zieU=; b=WiaxUGHzqEaPuSGx/BkkU5rCaOkVGtSllV6QF7cT31MNxVLFmCMpNaiTCd1oIU2366 tu/UFrtJtqdECn71gbnf1xySpY0XhSdW5mBFYOVZIq83j40ejn+CJw7yvl72XNjew7cp WQr7XK1d5BBmbFbUGFmKtBvkeKuGXTbH+Yi7QfxGCA17Tcat2Bskl89pAIdLX18elvEB wvqupDAjcsRPvgHHgz0DzVBNTyFsq4kDXmhWaussr09EFeahBXXywaGjuNzExgwydEln +FHkn+oAL5hCmeSgPINuIcEpsbKpwALr7QBOAtiiqjiNqSyNbp524MqlhXVwmBXMhdwz hPTg== 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=XvcDbsZt7z2QbmWEL4H7AxvS3rT0TlpriYQwxl5zieU=; b=B93y0CJHr12X9PMmZAMueonXKmxN42MCMnKPB1ZdhJXsAR4jPyzS1j03LWNuoAJOLV jm/QF/BKZ9n5wfimaB2E5FZv0rk8kiXZrFRFQ7tObkjItNOU7Oe7bvAEK/FvTP2stJHa Ww6P6SkqbdMeHciRxibxqTHRJpUbzM8gzo6H0sMAzKNeYhjBw/ub05R4jx8GwU8Q1ygO yuGAjkSswAzQ0JsCfEF5Uooy1nxukzTgz23bti4Z6Y4PQHU0BoF6Xc3f3tUbhEGtOCS5 8nvwrWSA0dwBBkifljGzYUrtr81V4ILhmtkXWFZr449UytJQnVFs3dWApd+YnE4/pd5A 2O0g== X-Gm-Message-State: AOAM5339L/5CNq5dlqaCkwKZKNnyLwKc78ACXPjz23kw4GCXP0hmzyVn 6K5xX6ZgJeaNxT9PRqAd+9o3nKeocwzSPg== X-Google-Smtp-Source: ABdhPJxeaGto6I54NVQAABqjrNJRz7VQcmvHN1aNnvd4TRv7i/W61YKbROLOZGTm/B1S4h4gW9KPFQ== X-Received: by 2002:aa7:9182:0:b029:142:2501:3977 with SMTP id x2-20020aa791820000b029014225013977mr7395443pfa.60.1600277613502; Wed, 16 Sep 2020 10:33:33 -0700 (PDT) Received: from VMware-box.domain ([97.115.183.169]) by smtp.googlemail.com with ESMTPSA id o20sm16248519pgh.63.2020.09.16.10.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 10:33:32 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Wed, 16 Sep 2020 10:33:03 -0700 Message-Id: <20200916173311.30956-17-gvrose8192@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200916173311.30956-1-gvrose8192@gmail.com> References: <20200916173311.30956-1-gvrose8192@gmail.com> Cc: Paolo Abeni Subject: [ovs-dev] [PATCH V3 16/24] datapath: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Paolo Abeni Upstream commit: commit 8ffeb03fbba3b599690b361467bfd2373e8c450f Author: Paolo Abeni Date: Sun Dec 1 18:41:24 2019 +0100 openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() All the callers of ovs_flow_cmd_build_info() already deal with error return code correctly, so we can handle the error condition in a more gracefull way. Still dump a warning to preserve debuggability. v1 -> v2: - clarify the commit message - clean the skb and report the error (DaveM) Fixes: ccb1352e76cf ("net: Add Open vSwitch kernel components.") Signed-off-by: Paolo Abeni Signed-off-by: David S. Miller Cc: Paolo Abeni Signed-off-by: Greg Rose Acked-by: Yi-Hung Wei --- datapath/datapath.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index 047b3312e..877c8bdba 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -946,7 +946,10 @@ static struct sk_buff *ovs_flow_cmd_build_info(const struct sw_flow *flow, retval = ovs_flow_cmd_fill_info(flow, dp_ifindex, skb, info->snd_portid, info->snd_seq, 0, cmd, ufid_flags); - BUG_ON(retval < 0); + if (WARN_ON_ONCE(retval < 0)) { + kfree_skb(skb); + skb = ERR_PTR(retval); + } return skb; }