Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4461207ybz; Tue, 28 Apr 2020 11:41:02 -0700 (PDT) X-Google-Smtp-Source: APiQypL9LbWW7QW9cIiHR/PCs1ZxuGBngW3V9DW2UeoZjFgFbveJbRARvX9GkNTX52pLPp4lQ8Ux X-Received: by 2002:a05:6402:22cd:: with SMTP id dm13mr11624496edb.56.1588099262243; Tue, 28 Apr 2020 11:41:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099262; cv=none; d=google.com; s=arc-20160816; b=yOWKJLq5d68er5DmpDs5ZsXAm3T9MKk/OtZF7rCUrYYPCxmqBfgkxbha3lLah1tHO7 AweBd8IhZdVljhEFflTIcjBU6J1MjST2Mb9rGPVk/IWA01TEBzURhJlV/zbRc5b88vBH hO9llAnSx1mDB4j5Q1HHxdM0GHfI0Pm+mKGAap3PLcNr0bYVbkCJvPyaDVg8zDhYigkC 1fvxBv2o6yRDgmppFZnjX7OUhLMkNpTIlOKY+quTbuRhJS2du4figj/x/yVs2T0UyUNZ qBGvWCIggKtYC6CzW3epts0Hnuhl2Ru0KZ5A9ViK/DO/TBUR6wljdIyS0ABp7ULE5KGA KKew== 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=KpyY0Mzmr8xWEl08+TNm2pom5Av3LJvr2+p8qEbpWeQ=; b=rofFlWKTvOIw64U8ZCtlNZdZ0cyT8uOYtufImaM04pZKyttxB2wTtA1WQNcB/KnCMc GucZDSsHWUYw2hdD+eq8Ea6k3qZfVdUcz7pftNElOSL51uwyA5yR8vuGy8/Y+qDEArdM g914Q5fOpv26Re9g70A/N/wamkxhd+sA7cVJjuJVS4d+rwfn6BYTOHmHcdE9YVlF4Njp t7xwr6t10W7/oeBhJBUcL0huahMG7B81iMaermlSOfoBa86/YKI/AqalJQOvnFaR7WGL zUXAAcmEmsPrWgkXOV8r3npEJSv1lk7A8AK4aXaENKVxlX4C7euYgodZl/5SYOvGB8tg 9GAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DA0ScyKc; 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 a22si2081003edx.81.2020.04.28.11.40.38; Tue, 28 Apr 2020 11:41:02 -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=DA0ScyKc; 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 S1730691AbgD1Siy (ORCPT + 99 others); Tue, 28 Apr 2020 14:38:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:57500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730681AbgD1Siv (ORCPT ); Tue, 28 Apr 2020 14:38:51 -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 E827B208E0; Tue, 28 Apr 2020 18:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099131; bh=YqMhhaim/jzNbsVKd4Bfn1CEZ7m28Z+4VfMAyZgXLZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DA0ScyKcG8GZcsWu57rC4dUR4QLhUWfSOdlHGVldn1FhR7L967VeiQ4lJRan7Llvo 6AtRc1iKjJMu2gxwIcq2bH5NmC9NljtR6VmxV6UKndCPr2x3FtAgWkVywmJfyM+8Aw xGsrStFFLxfcD/p9pNt+dfo66dApFh/7sByJHCGY= 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 5.4 060/168] macsec: avoid to set wrong mtu Date: Tue, 28 Apr 2020 20:23:54 +0200 Message-Id: <20200428182239.519146479@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@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 @@ -3226,11 +3226,11 @@ static int macsec_newlink(struct net *ne struct netlink_ext_ack *extack) { 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; @@ -3246,7 +3246,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)