Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp702814ybz; Fri, 1 May 2020 07:05:16 -0700 (PDT) X-Google-Smtp-Source: APiQypKzUj8Wa0kxXTud15xxHmWWD2IToLXLjiYHRnl8BXLX/uu+X/1WrKpHxCCQ9o21+TyTM84A X-Received: by 2002:a17:906:f90d:: with SMTP id lc13mr3157825ejb.367.1588341916342; Fri, 01 May 2020 07:05:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588341916; cv=none; d=google.com; s=arc-20160816; b=PviOPA9cgg4jNtOcAOLDizAoiELhwEUabGLe89Y9YkLLfxaGbNqt4DfjKNLC3LSiSy aBrJWnhBXf0ojmUTJfaW9HSmvb2S0ex2MX80xom/fe/luxJ1P59lvd9uJU0df1Q/+4bW QK+mj/9S+zP9KVwb5DJDNQ+RcTDmzUEhuW4l9DejzlC5jlDXC0d/zMOIBeQlHo1xISUf 9ZHWt+ORHqAifEiTUklo7IL+XWtdr+MAE5/pJI1H0e6bo0QQWwAy1FsXi9aTkYxTBm4l BsMgvwvqRyeJ3/NAaepmYDXDAj1VFJDdrDicl6CDk+LMlae6sdoqZgPPmqIH4y2Ytb15 WhZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C13KLtGgyCXEPmdJ5e1rZJN4ByHSStBq5Q0lhFhFN8Y=; b=XLcF6hE5u2fMVXZsyo5ydVWP8vCbqcZHDT2E0WFeaSe5tu8pJcGUBCwNMBsS3g1JbN 2NZQTUzttGLJqsXbwSPxXi7yqlIiA6uEmYnGpSaiVIkCbRAH2vJnFQ816L9MIoC1dXzG n++dOE0rV2uILxnHqY/Ff0xFSdxFipinE/e/lVYtTG5LCFk2Yv/pxGrVYEn43/ZdRtLN +suMTU1+GF44Uf2uZiAVEqbXVk5aEqWavjjVrguI983zLe1cX12r8TSCXL4O+vPLgDNI 6sBkC7Pu8RQJHD/HeXUTP4c7Jf3kc7RUk0CMioApEc4seS0GPdXjui/3gTFPbbxcXXKH OO5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2sl4Oig9; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k3si1679605edk.571.2020.05.01.07.04.39; Fri, 01 May 2020 07:05:16 -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=@kernel.org header.s=default header.b=2sl4Oig9; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729645AbgEAN2h (ORCPT + 99 others); Fri, 1 May 2020 09:28:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:51674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729626AbgEAN2c (ORCPT ); Fri, 1 May 2020 09:28:32 -0400 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 3A33D2166E; Fri, 1 May 2020 13:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339711; bh=oKniy+kiYwiUS+eRELPq61cbjj8BQLGPrq2i4CNt50w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2sl4Oig9lxyJciylx9oOnTpeoxkobz6KUGbQNv0y/zCYu70KOrPvZupSqz5sUy7bE wyHvvef/BZpaPFpSl8TOm3tQnaVXKjLcgjjt4SLC+gAoRAcpscHDrFNGlVhXu9+wf1 7I3Y4gNp3w+beX5GUvwTgx5CPQ6j2brqc5U5mgFc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Taehee Yoo , "David S. Miller" Subject: [PATCH 4.9 21/80] macsec: avoid to set wrong mtu Date: Fri, 1 May 2020 15:21:15 +0200 Message-Id: <20200501131521.178970534@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131513.810761598@linuxfoundation.org> References: <20200501131513.810761598@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: Taehee Yoo [ Upstream commit 7f327080364abccf923fa5a5b24e038eb0ba1407 ] When a macsec interface is created, the mtu is calculated with the lower interface's mtu value. If the mtu of lower interface is lower than the length, which is needed by macsec interface, macsec's mtu value will be overflowed. So, if the lower interface's mtu is too low, macsec interface's mtu should be set to 0. Test commands: ip link add dummy0 mtu 10 type dummy ip link add macsec0 link dummy0 type macsec ip link show macsec0 Before: 11: macsec0@dummy0: mtu 4294967274 After: 11: macsec0@dummy0: mtu 0 Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver") Signed-off-by: Taehee Yoo Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/macsec.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -3209,11 +3209,11 @@ static int macsec_newlink(struct net *ne struct nlattr *tb[], struct nlattr *data[]) { struct macsec_dev *macsec = macsec_priv(dev); + rx_handler_func_t *rx_handler; + u8 icv_len = DEFAULT_ICV_LEN; struct net_device *real_dev; - int err; + int err, mtu; sci_t sci; - u8 icv_len = DEFAULT_ICV_LEN; - rx_handler_func_t *rx_handler; if (!tb[IFLA_LINK]) return -EINVAL; @@ -3229,7 +3229,11 @@ static int macsec_newlink(struct net *ne if (data && data[IFLA_MACSEC_ICV_LEN]) icv_len = nla_get_u8(data[IFLA_MACSEC_ICV_LEN]); - dev->mtu = real_dev->mtu - icv_len - macsec_extra_len(true); + mtu = real_dev->mtu - icv_len - macsec_extra_len(true); + if (mtu < 0) + dev->mtu = 0; + else + dev->mtu = mtu; rx_handler = rtnl_dereference(real_dev->rx_handler); if (rx_handler && rx_handler != macsec_handle_frame)