* [PATCH net-next 0/2] virtio_net: better ethtool setting validation
@ 2016-02-07 20:52 Nikolay Aleksandrov
2016-02-07 20:52 ` [PATCH net-next 1/2] ethtool: make validate_speed accept all speeds between 0 and INT_MAX Nikolay Aleksandrov
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Nikolay Aleksandrov @ 2016-02-07 20:52 UTC (permalink / raw)
To: netdev; +Cc: mst, roopa, davem, Nikolay Aleksandrov
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Hi,
This small set is a follow-up for the recent patches that added ethtool
get/set settings. Patch 1 changes the speed validation routine to check
if the speed is between 0 and INT_MAX (or SPEED_UNKNOWN) and patch 2 adds
port validation to virtio_net and better validation comment.
This set is on top of Michael's patch which explains that speeds from 0
to INT_MAX are valid:
http://patchwork.ozlabs.org/patch/578911/
Cheers,
Nik
Nikolay Aleksandrov (2):
ethtool: make validate_speed accept all speeds between 0 and INT_MAX
virtio_net: validate ethtool port setting and explain the user
validation
drivers/net/virtio_net.c | 6 ++++--
include/uapi/linux/ethtool.h | 19 +------------------
2 files changed, 5 insertions(+), 20 deletions(-)
--
2.4.3
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH net-next 1/2] ethtool: make validate_speed accept all speeds between 0 and INT_MAX
2016-02-07 20:52 [PATCH net-next 0/2] virtio_net: better ethtool setting validation Nikolay Aleksandrov
@ 2016-02-07 20:52 ` Nikolay Aleksandrov
2016-02-07 21:26 ` Michael S. Tsirkin
2016-02-07 20:52 ` [PATCH net-next 2/2] virtio_net: validate ethtool port setting and explain the user validation Nikolay Aleksandrov
2016-02-11 16:56 ` [PATCH net-next 0/2] virtio_net: better ethtool setting validation David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Nikolay Aleksandrov @ 2016-02-07 20:52 UTC (permalink / raw)
To: netdev; +Cc: mst, roopa, davem, Nikolay Aleksandrov
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Devices these days can have any speed and as was recently pointed out
any speed from 0 to INT_MAX is valid so adjust speed validation to
accept such values.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
---
include/uapi/linux/ethtool.h | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 19676a420fe3..0c608192a4ef 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -1321,24 +1321,7 @@ enum ethtool_sfeatures_retval_bits {
static inline int ethtool_validate_speed(__u32 speed)
{
- switch (speed) {
- case SPEED_10:
- case SPEED_100:
- case SPEED_1000:
- case SPEED_2500:
- case SPEED_5000:
- case SPEED_10000:
- case SPEED_20000:
- case SPEED_25000:
- case SPEED_40000:
- case SPEED_50000:
- case SPEED_56000:
- case SPEED_100000:
- case SPEED_UNKNOWN:
- return 1;
- }
-
- return 0;
+ return speed <= INT_MAX || speed == SPEED_UNKNOWN;
}
/* Duplex, half or full. */
--
2.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH net-next 1/2] ethtool: make validate_speed accept all speeds between 0 and INT_MAX
2016-02-07 20:52 ` [PATCH net-next 1/2] ethtool: make validate_speed accept all speeds between 0 and INT_MAX Nikolay Aleksandrov
@ 2016-02-07 21:26 ` Michael S. Tsirkin
0 siblings, 0 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2016-02-07 21:26 UTC (permalink / raw)
To: Nikolay Aleksandrov; +Cc: netdev, roopa, davem, Nikolay Aleksandrov
On Sun, Feb 07, 2016 at 09:52:23PM +0100, Nikolay Aleksandrov wrote:
> From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
>
> Devices these days can have any speed and as was recently pointed out
> any speed from 0 to INT_MAX is valid so adjust speed validation to
> accept such values.
>
> Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> include/uapi/linux/ethtool.h | 19 +------------------
> 1 file changed, 1 insertion(+), 18 deletions(-)
>
> diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
> index 19676a420fe3..0c608192a4ef 100644
> --- a/include/uapi/linux/ethtool.h
> +++ b/include/uapi/linux/ethtool.h
> @@ -1321,24 +1321,7 @@ enum ethtool_sfeatures_retval_bits {
>
> static inline int ethtool_validate_speed(__u32 speed)
> {
> - switch (speed) {
> - case SPEED_10:
> - case SPEED_100:
> - case SPEED_1000:
> - case SPEED_2500:
> - case SPEED_5000:
> - case SPEED_10000:
> - case SPEED_20000:
> - case SPEED_25000:
> - case SPEED_40000:
> - case SPEED_50000:
> - case SPEED_56000:
> - case SPEED_100000:
> - case SPEED_UNKNOWN:
> - return 1;
> - }
> -
> - return 0;
> + return speed <= INT_MAX || speed == SPEED_UNKNOWN;
> }
>
> /* Duplex, half or full. */
> --
> 2.4.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next 2/2] virtio_net: validate ethtool port setting and explain the user validation
2016-02-07 20:52 [PATCH net-next 0/2] virtio_net: better ethtool setting validation Nikolay Aleksandrov
2016-02-07 20:52 ` [PATCH net-next 1/2] ethtool: make validate_speed accept all speeds between 0 and INT_MAX Nikolay Aleksandrov
@ 2016-02-07 20:52 ` Nikolay Aleksandrov
2016-02-07 21:26 ` Michael S. Tsirkin
2016-02-11 16:56 ` [PATCH net-next 0/2] virtio_net: better ethtool setting validation David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Nikolay Aleksandrov @ 2016-02-07 20:52 UTC (permalink / raw)
To: netdev; +Cc: mst, roopa, davem, Nikolay Aleksandrov
From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
We should validate the port setting that we got from the user and check
if it's what we've set it to (PORT_OTHER), also add explanation that
ignoring advertising is good as long as we don't have autonegotiation.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
---
drivers/net/virtio_net.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index c9fd52a8e6ec..fb0eae42bf39 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1386,11 +1386,13 @@ static bool virtnet_validate_ethtool_cmd(const struct ethtool_cmd *cmd)
struct ethtool_cmd diff1 = *cmd;
struct ethtool_cmd diff2 = {};
- /* advertising and cmd are usually set, ignore port because we set it */
+ /* cmd is always set so we need to clear it, validate the port type
+ * and also without autonegotiation we can ignore advertising
+ */
ethtool_cmd_speed_set(&diff1, 0);
+ diff2.port = PORT_OTHER;
diff1.advertising = 0;
diff1.duplex = 0;
- diff1.port = 0;
diff1.cmd = 0;
return !memcmp(&diff1, &diff2, sizeof(diff1));
--
2.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH net-next 2/2] virtio_net: validate ethtool port setting and explain the user validation
2016-02-07 20:52 ` [PATCH net-next 2/2] virtio_net: validate ethtool port setting and explain the user validation Nikolay Aleksandrov
@ 2016-02-07 21:26 ` Michael S. Tsirkin
0 siblings, 0 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2016-02-07 21:26 UTC (permalink / raw)
To: Nikolay Aleksandrov; +Cc: netdev, roopa, davem, Nikolay Aleksandrov
On Sun, Feb 07, 2016 at 09:52:24PM +0100, Nikolay Aleksandrov wrote:
> From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
>
> We should validate the port setting that we got from the user and check
> if it's what we've set it to (PORT_OTHER), also add explanation that
> ignoring advertising is good as long as we don't have autonegotiation.
>
> Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/net/virtio_net.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index c9fd52a8e6ec..fb0eae42bf39 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -1386,11 +1386,13 @@ static bool virtnet_validate_ethtool_cmd(const struct ethtool_cmd *cmd)
> struct ethtool_cmd diff1 = *cmd;
> struct ethtool_cmd diff2 = {};
>
> - /* advertising and cmd are usually set, ignore port because we set it */
> + /* cmd is always set so we need to clear it, validate the port type
> + * and also without autonegotiation we can ignore advertising
> + */
> ethtool_cmd_speed_set(&diff1, 0);
> + diff2.port = PORT_OTHER;
> diff1.advertising = 0;
> diff1.duplex = 0;
> - diff1.port = 0;
> diff1.cmd = 0;
>
> return !memcmp(&diff1, &diff2, sizeof(diff1));
> --
> 2.4.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 0/2] virtio_net: better ethtool setting validation
2016-02-07 20:52 [PATCH net-next 0/2] virtio_net: better ethtool setting validation Nikolay Aleksandrov
2016-02-07 20:52 ` [PATCH net-next 1/2] ethtool: make validate_speed accept all speeds between 0 and INT_MAX Nikolay Aleksandrov
2016-02-07 20:52 ` [PATCH net-next 2/2] virtio_net: validate ethtool port setting and explain the user validation Nikolay Aleksandrov
@ 2016-02-11 16:56 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2016-02-11 16:56 UTC (permalink / raw)
To: razor; +Cc: netdev, mst, roopa, nikolay
From: Nikolay Aleksandrov <razor@blackwall.org>
Date: Sun, 7 Feb 2016 21:52:22 +0100
> This small set is a follow-up for the recent patches that added ethtool
> get/set settings. Patch 1 changes the speed validation routine to check
> if the speed is between 0 and INT_MAX (or SPEED_UNKNOWN) and patch 2 adds
> port validation to virtio_net and better validation comment.
>
> This set is on top of Michael's patch which explains that speeds from 0
> to INT_MAX are valid:
> http://patchwork.ozlabs.org/patch/578911/
Series applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-11 16:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-07 20:52 [PATCH net-next 0/2] virtio_net: better ethtool setting validation Nikolay Aleksandrov
2016-02-07 20:52 ` [PATCH net-next 1/2] ethtool: make validate_speed accept all speeds between 0 and INT_MAX Nikolay Aleksandrov
2016-02-07 21:26 ` Michael S. Tsirkin
2016-02-07 20:52 ` [PATCH net-next 2/2] virtio_net: validate ethtool port setting and explain the user validation Nikolay Aleksandrov
2016-02-07 21:26 ` Michael S. Tsirkin
2016-02-11 16:56 ` [PATCH net-next 0/2] virtio_net: better ethtool setting validation David Miller
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).