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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 2A07BC432C3 for ; Fri, 22 Nov 2019 11:28:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8CEF20672 for ; Fri, 22 Nov 2019 11:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574422081; bh=rrZSbi4G4miTJyPIz+Y84gcUjifvPimzBYe2sbVKh24=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q+ITTqe3YToM6IXA5iC+SSxkZlSHyJjtdUahQApRmtLXIgKyua/VRlhApl1l2aECQ 1c2msgEjWEAAgh2RX1AMKQAylRWEAGgLFSzF3Ys3LeJmY1W91tOmjf/BvR83U3sQXC cM/oriJsc3JCIihx9EGvWJzn0tVD+k2qOsT0UzT4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727316AbfKVKbn (ORCPT ); Fri, 22 Nov 2019 05:31:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:52120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726840AbfKVKbm (ORCPT ); Fri, 22 Nov 2019 05:31:42 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 21D1D20714; Fri, 22 Nov 2019 10:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418701; bh=rrZSbi4G4miTJyPIz+Y84gcUjifvPimzBYe2sbVKh24=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=etv7C/rwpWf1ZGlrt9I3fQw3xF8DKeIiqG5bq87+2gPZ5ojDe8UpKon0QKmsOfjAc EqTjglrIEJ5T8qkIc1CXQdmRfaqVVvyx5x+QSuucpfLOPXuyFNGvC99qrL4rgVHbvb iknAVsWrR3A/5Np0oH9U4N5WV2dIZ+3sDS4IGOws= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Patryk=20Ma=C5=82ek?= , Andrew Bowers , Jeff Kirsher , Sasha Levin Subject: [PATCH 4.4 022/159] i40e: Prevent deleting MAC address from VF when set by PF Date: Fri, 22 Nov 2019 11:26:53 +0100 Message-Id: <20191122100721.942284583@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Patryk Małek [ Upstream commit 5907cf6c5bbe78be2ed18b875b316c6028b20634 ] To prevent VF from deleting MAC address that was assigned by the PF we need to check for that scenario when we try to delete a MAC address from a VF. Signed-off-by: Patryk Małek Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index e116d9a99b8e9..cdb263875efb3 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -1677,6 +1677,16 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) ret = I40E_ERR_INVALID_MAC_ADDR; goto error_param; } + + if (vf->pf_set_mac && + ether_addr_equal(al->list[i].addr, + vf->default_lan_addr.addr)) { + dev_err(&pf->pdev->dev, + "MAC addr %pM has been set by PF, cannot delete it for VF %d, reset VF to change MAC addr\n", + vf->default_lan_addr.addr, vf->vf_id); + ret = I40E_ERR_PARAM; + goto error_param; + } } vsi = pf->vsi[vf->lan_vsi_idx]; -- 2.20.1