From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10ED0C43603 for ; Wed, 4 Dec 2019 18:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC2F120862 for ; Wed, 4 Dec 2019 18:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483264; bh=ymmdOMpoTUi2nRCMXulIM8OpjOTxMBNwjovAUehgbuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r8N9kgHbxQOgF/LxfnTckay36ukCVPRv65qRn1LFEayHklpH3rP7f4tq8vT43oo5L MVvx3mEYVeUNQ4esP9n2BkX6HdNcsRTnB/HUwHEXkWyEukTL8TbjFpE7C7tUgm3N85 ZCKCxUdG8ghxEENC3m+u6Y3wEKccZSGDQSJyjpC4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728997AbfLDSOY (ORCPT ); Wed, 4 Dec 2019 13:14:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:43678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730756AbfLDSOV (ORCPT ); Wed, 4 Dec 2019 13:14:21 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6A26C20674; Wed, 4 Dec 2019 18:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483260; bh=ymmdOMpoTUi2nRCMXulIM8OpjOTxMBNwjovAUehgbuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gMMK0LZnrhMQrBSNEnClpKJYgGvBVyBik01bWBwZME4eNXMpllZ+xBJ7nf8T8eAdt UYUsPD9vfbJJQ33j5zV7qQqFDQXKcFUplNasHk8xLjjCqci45C1vhUD3v4+rgBof1A uctMHupYtuoOUvMjXhl3CzpLwJqXIPHWUloJqMN8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paolo Abeni , "David S. Miller" Subject: [PATCH 4.9 117/125] openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() Date: Wed, 4 Dec 2019 18:57:02 +0100 Message-Id: <20191204175326.322840740@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175308.377746305@linuxfoundation.org> References: <20191204175308.377746305@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paolo Abeni [ Upstream commit 8ffeb03fbba3b599690b361467bfd2373e8c450f ] 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 Signed-off-by: Greg Kroah-Hartman --- net/openvswitch/datapath.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -920,7 +920,10 @@ static struct sk_buff *ovs_flow_cmd_buil 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; }