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 90DD1C43603 for ; Wed, 4 Dec 2019 18:08:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6408E206DF for ; Wed, 4 Dec 2019 18:08:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482888; bh=fd8Mb3TSzCyjnQWsjzliE7N5Lylgz2eJBuYrzVdusLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Pu0e22wZ3AcCIPo8lQSF/ZTHDsZBxIkWbVfsfe7C2BFV8oiUlzbAa8U6DNccDsHjg XMP+sJwsLJIw0a9caO4unyTqpx5rD41Hns8KvqeO6Du0C+8kvdg8yhfs0tSnVxYjU+ a8KFXZgPn+UZrQIjBiA7H7jyjqvC0Tll6GshpusA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730529AbfLDSIH (ORCPT ); Wed, 4 Dec 2019 13:08:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:59104 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730847AbfLDSIB (ORCPT ); Wed, 4 Dec 2019 13:08:01 -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 CD4DD20674; Wed, 4 Dec 2019 18:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482881; bh=fd8Mb3TSzCyjnQWsjzliE7N5Lylgz2eJBuYrzVdusLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uUcz2thnCrcAHLBZei7ocE5ARgBZMTpjBO1ZCZz3Unaft5MVTwhFuCGctq+QihoHl DLSygMOAvySy7WRJBtFq624kYzzbS1f/kbmFiZpmkDBpy54PJLuCHxBzIvz9UnFOUd GCRYz+5FeyxFFPN1dmWCOyNP1AcktFrHxTcpc/C4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qi Jun Ding , Paolo Abeni , "David S. Miller" Subject: [PATCH 4.14 171/209] openvswitch: fix flow command message size Date: Wed, 4 Dec 2019 18:56:23 +0100 Message-Id: <20191204175335.261039886@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@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 4e81c0b3fa93d07653e2415fa71656b080a112fd ] When user-space sets the OVS_UFID_F_OMIT_* flags, and the relevant flow has no UFID, we can exceed the computed size, as ovs_nla_put_identifier() will always dump an OVS_FLOW_ATTR_KEY attribute. Take the above in account when computing the flow command message size. Fixes: 74ed7ab9264c ("openvswitch: Add support for unique flow IDs.") Reported-by: Qi Jun Ding Signed-off-by: Paolo Abeni Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/openvswitch/datapath.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -724,9 +724,13 @@ static size_t ovs_flow_cmd_msg_size(cons { size_t len = NLMSG_ALIGN(sizeof(struct ovs_header)); - /* OVS_FLOW_ATTR_UFID */ + /* OVS_FLOW_ATTR_UFID, or unmasked flow key as fallback + * see ovs_nla_put_identifier() + */ if (sfid && ovs_identifier_is_ufid(sfid)) len += nla_total_size(sfid->ufid_len); + else + len += nla_total_size(ovs_key_attr_size()); /* OVS_FLOW_ATTR_KEY */ if (!sfid || should_fill_key(sfid, ufid_flags))