Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp220030pxb; Mon, 13 Sep 2021 17:29:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsLBASwmEDmSVaBsVB1rzpjXnFfb4RKhqp+s6FVxcplVEX2QFwSfid5EDTR6OiFpyvg0Kr X-Received: by 2002:a17:906:8450:: with SMTP id e16mr15848021ejy.305.1631579380240; Mon, 13 Sep 2021 17:29:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631579380; cv=none; d=google.com; s=arc-20160816; b=hjEiR0U/V8g/mFgK6FhNWHnOnKTenCuiIwSBrnVOQaktAHZ/quq2SLBT0ZIM2e8DAN o1CGYrTGRq3E+FBI7A/F4xZxsR/87mxQleJl0jd9o1IlPantRXYv2LIHly+H8eg+PfQH RXo/wWbS8gx7Q2je+U2PCqQZtZeqdkN3LS98Eac3/NJ8/h52Z0bz8oYDLkK6gbodNxU1 L25E5/JX+iGN3EtjoNWwKRwuFy5iR4BiCVFeHXZ8rL/z9CYrLEa62CDMbV9VDSVnZLUj DW88oe+nxbEglJCbakPky6eFHWdUklMvj/dzddtHEGVAZYHpnG7zdlLcCIui+J7ku4sF BpcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RD6P1uBz0J4VQH/ZVW+MLOFGONsDE706NZxHF/rxxtY=; b=ofleVBMuA4bsk4q3+94+QMwYpTHOY/EFoq/507coLHhi/SFOG6Ji82i4qbfaISyP+/ 9hciBYz0myJX2AwpBjsue7crBTXsufHn/Uif9lp0BSbN5+DlM9Aw0a34phV39T06gfkp g4Jsg7vFM/3mTdLwSuhbOdohoecDctXmhWoMgbCyY50PvCJOarWXMN+8FNBPvjdeyxsT Q17VhZI6eV6s4pkoefTUjdFQ7eFqnMERFOMBwmovVK5eKahou5hXHIg7YbU0QQim0qKe L7+foGOgdfIbWgI9WdRWuRAzOgXmMDb6WaKNwCoCD0KF+hO28oxrMd1AFXFfFfZ+uoO4 0kqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tIWwwaIv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m18si8629815ejl.243.2021.09.13.17.29.11; Mon, 13 Sep 2021 17:29:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tIWwwaIv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242255AbhIMOPq (ORCPT + 99 others); Mon, 13 Sep 2021 10:15:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:59948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245082AbhIMOMC (ORCPT ); Mon, 13 Sep 2021 10:12:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1E05F61ABA; Mon, 13 Sep 2021 13:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540557; bh=f0jqccH4u31D1hQ9soH6LUANBvUjxwkJJZdHnqN0E98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tIWwwaIvFkmkhE3+sTqZ0Ph5sAH2Cd25tDMUeDNhPXp9mAwcbtenAcxttzvgeA3ph 6dNJZB5dOq+HPPOntdUSoQOYWNlJEdzO6UshkagRt3+CrGuL78FTtJ9vj2q77avzcF uU6dbgiMT2qc2OGApKd8lqkTILJLQ6DSay3YSzEI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Roi Dayan , Paul Blakey , Saeed Mahameed , Sasha Levin Subject: [PATCH 5.13 243/300] net/mlx5e: Fix possible use-after-free deleting fdb rule Date: Mon, 13 Sep 2021 15:15:04 +0200 Message-Id: <20210913131117.561306333@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roi Dayan [ Upstream commit 9a5f9cc794e17cf6ed2a5bb215d2e8b6832db444 ] After neigh-update-add failure we are still with a slow path rule but the driver always assume the rule is an fdb rule. Fix neigh-update-del by checking slow path tc flag on the flow. Also fix neigh-update-add for when neigh-update-del fails the same. Fixes: 5dbe906ff1d5 ("net/mlx5e: Use a slow path rule instead if vxlan neighbour isn't available") Signed-off-by: Roi Dayan Reviewed-by: Paul Blakey Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c index 490131e06efb..aa4dc7d624f8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c @@ -143,7 +143,7 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, mlx5e_rep_queue_neigh_stats_work(priv); list_for_each_entry(flow, flow_list, tmp_list) { - if (!mlx5e_is_offloaded_flow(flow)) + if (!mlx5e_is_offloaded_flow(flow) || !flow_flag_test(flow, SLOW)) continue; attr = flow->attr; esw_attr = attr->esw_attr; @@ -184,7 +184,7 @@ void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv, int err; list_for_each_entry(flow, flow_list, tmp_list) { - if (!mlx5e_is_offloaded_flow(flow)) + if (!mlx5e_is_offloaded_flow(flow) || flow_flag_test(flow, SLOW)) continue; attr = flow->attr; esw_attr = attr->esw_attr; -- 2.30.2