netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, ecree.xilinx@gmail.com,
	michael.chan@broadcom.com, paul.greenwalt@intel.com,
	rajur@chelsio.com, jaroslawx.gawin@intel.com,
	vkochan@marvell.com, alobakin@pm.me, snelson@pensando.io,
	shayagr@amazon.com, ayal@nvidia.com, shenjian15@huawei.com,
	saeedm@nvidia.com, mkubecek@suse.cz, andrew@lunn.ch,
	roopa@nvidia.com, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v2 5/6] ethtool: fec: sanitize ethtool_fecparam->fec
Date: Thu, 25 Mar 2021 19:07:26 -0700	[thread overview]
Message-ID: <20210326020727.246828-6-kuba@kernel.org> (raw)
In-Reply-To: <20210326020727.246828-1-kuba@kernel.org>

Reject NONE on set, this mode means device does not support
FEC so it's a little out of place in the set interface.

This should be safe to do - user space ethtool does not allow
the use of NONE on set. A few drivers treat it the same as OFF,
but none use it instead of OFF.

Similarly reject an empty FEC mask. The common user space tool
will not send such requests and most drivers correctly reject
it already.

v2: - use mask not bit pos

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 net/ethtool/ioctl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 237ffe5440ef..26b3e7086075 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -2582,14 +2582,17 @@ static int ethtool_set_fecparam(struct net_device *dev, void __user *useraddr)
 
 	if (!dev->ethtool_ops->set_fecparam)
 		return -EOPNOTSUPP;
 
 	if (copy_from_user(&fecparam, useraddr, sizeof(fecparam)))
 		return -EFAULT;
 
+	if (!fecparam.fec || fecparam.fec & ETHTOOL_FEC_NONE)
+		return -EINVAL;
+
 	fecparam.active_fec = 0;
 	fecparam.reserved = 0;
 
 	return dev->ethtool_ops->set_fecparam(dev, &fecparam);
 }
 
 /* The main entry point in this file.  Called from net/core/dev_ioctl.c */
-- 
2.30.2


  parent reply	other threads:[~2021-03-26  2:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-26  2:07 [PATCH net-next v2 0/6] ethtool: clarify the ethtool FEC interface Jakub Kicinski
2021-03-26  2:07 ` [PATCH net-next v2 1/6] ethtool: fec: fix typo in kdoc Jakub Kicinski
2021-03-26  2:07 ` [PATCH net-next v2 2/6] ethtool: fec: remove long structure description Jakub Kicinski
2021-03-26  2:07 ` [PATCH net-next v2 3/6] ethtool: fec: sanitize ethtool_fecparam->reserved Jakub Kicinski
2021-03-26 12:17   ` Andrew Lunn
2021-03-26  2:07 ` [PATCH net-next v2 4/6] ethtool: fec: sanitize ethtool_fecparam->active_fec Jakub Kicinski
2021-03-26  2:07 ` Jakub Kicinski [this message]
2021-03-26 12:18   ` [PATCH net-next v2 5/6] ethtool: fec: sanitize ethtool_fecparam->fec Andrew Lunn
2021-03-26  2:07 ` [PATCH net-next v2 6/6] ethtool: clarify the ethtool FEC interface Jakub Kicinski
2021-03-26 12:20   ` Andrew Lunn
2021-03-26 21:49 ` [PATCH net-next v2 0/6] " David Miller

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=20210326020727.246828-6-kuba@kernel.org \
    --to=kuba@kernel.org \
    --cc=alobakin@pm.me \
    --cc=andrew@lunn.ch \
    --cc=ayal@nvidia.com \
    --cc=davem@davemloft.net \
    --cc=ecree.xilinx@gmail.com \
    --cc=jaroslawx.gawin@intel.com \
    --cc=michael.chan@broadcom.com \
    --cc=mkubecek@suse.cz \
    --cc=netdev@vger.kernel.org \
    --cc=paul.greenwalt@intel.com \
    --cc=rajur@chelsio.com \
    --cc=roopa@nvidia.com \
    --cc=saeedm@nvidia.com \
    --cc=shayagr@amazon.com \
    --cc=shenjian15@huawei.com \
    --cc=snelson@pensando.io \
    --cc=vkochan@marvell.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;
as well as URLs for NNTP newsgroup(s).