From: "Kweh, Hock Leong" <hock.leong.kweh@intel.com>
To: "David S. Miller" <davem@davemloft.net>,
Joao Pinto <Joao.Pinto@synopsys.com>,
Giuseppe CAVALLARO <peppe.cavallaro@st.com>,
seraphin.bonnaffe@st.com, Jarod Wilson <jarod@redhat.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Alexandre TORGUE <alexandre.torgue@gmail.com>,
Joachim Eastwood <manabian@gmail.com>,
Niklas Cassel <niklas.cassel@axis.com>,
Johan Hovold <johan@kernel.org>,
pavel@ucw.cz, "Kweh, Hock Leong" <hock.leong.kweh@intel.com>,
lars.persson@axis.com, netdev <netdev@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH v2] net: stmmac: fix maxmtu assignment to be within valid range
Date: Fri, 6 Jan 2017 18:08:26 +0800 [thread overview]
Message-ID: <1483697306-10063-1-git-send-email-hock.leong.kweh@intel.com> (raw)
From: "Kweh, Hock Leong" <hock.leong.kweh@intel.com>
There is no checking valid value of maxmtu when getting it from device tree.
This resolution added the checking condition to ensure the assignment is
made within a valid range.
Signed-off-by: Kweh, Hock Leong <hock.leong.kweh@intel.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 92ac006..4df555e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3345,8 +3345,14 @@ int stmmac_dvr_probe(struct device *device,
ndev->max_mtu = JUMBO_LEN;
else
ndev->max_mtu = SKB_MAX_HEAD(NET_SKB_PAD + NET_IP_ALIGN);
- if (priv->plat->maxmtu < ndev->max_mtu)
+
+ if ((priv->plat->maxmtu < ndev->max_mtu) &&
+ (priv->plat->maxmtu >= ndev->min_mtu))
ndev->max_mtu = priv->plat->maxmtu;
+ else if (priv->plat->maxmtu != 0)
+ netdev_warn(priv->dev,
+ "%s: warning: maxmtu having invalid value (%d)\n",
+ __func__, priv->plat->maxmtu);
if (flow_ctrl)
priv->flow_ctrl = FLOW_AUTO; /* RX/TX pause on */
--
1.7.9.5
next reply other threads:[~2017-01-06 10:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 10:08 Kweh, Hock Leong [this message]
2017-01-06 15:55 ` [PATCH v2] net: stmmac: fix maxmtu assignment to be within valid range Kweh, Hock Leong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1483697306-10063-1-git-send-email-hock.leong.kweh@intel.com \
--to=hock.leong.kweh@intel.com \
--cc=Joao.Pinto@synopsys.com \
--cc=alexandre.torgue@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=davem@davemloft.net \
--cc=jarod@redhat.com \
--cc=johan@kernel.org \
--cc=lars.persson@axis.com \
--cc=linux-kernel@vger.kernel.org \
--cc=manabian@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=niklas.cassel@axis.com \
--cc=pavel@ucw.cz \
--cc=peppe.cavallaro@st.com \
--cc=seraphin.bonnaffe@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox