114 lines
3.2 KiB
Diff
114 lines
3.2 KiB
Diff
From 7e3888aeb31d2920c3c282b135563a06c3bcf6e1 Mon Sep 17 00:00:00 2001
|
|
From: Michal Kubecek <mkubecek@suse.cz>
|
|
Date: Sun, 23 Aug 2020 21:40:27 +0200
|
|
Subject: [PATCH 06/17] ioctl: make argc counters unsigned
|
|
|
|
Use unsigned int for cmd_context::argc and local variables used for
|
|
command line argument count. These counters may never get negative and are
|
|
often compared to unsigned expressions.
|
|
|
|
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
(cherry picked from commit 519f95bd59034e672cfbac70ca8d7badc4f26cc7)
|
|
---
|
|
ethtool.c | 24 ++++++++++++------------
|
|
internal.h | 2 +-
|
|
2 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/ethtool.c b/ethtool.c
|
|
index 6c12452be7b4..7c7e98957c80 100644
|
|
--- a/ethtool.c
|
|
+++ b/ethtool.c
|
|
@@ -223,9 +223,9 @@ static void parse_generic_cmdline(struct cmd_context *ctx,
|
|
struct cmdline_info *info,
|
|
unsigned int n_info)
|
|
{
|
|
- int argc = ctx->argc;
|
|
+ unsigned int argc = ctx->argc;
|
|
char **argp = ctx->argp;
|
|
- int i, idx;
|
|
+ unsigned int i, idx;
|
|
int found;
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
@@ -2724,9 +2724,9 @@ static int do_sset(struct cmd_context *ctx)
|
|
u32 msglvl_wanted = 0;
|
|
u32 msglvl_mask = 0;
|
|
struct cmdline_info cmdline_msglvl[n_flags_msglvl];
|
|
- int argc = ctx->argc;
|
|
+ unsigned int argc = ctx->argc;
|
|
char **argp = ctx->argp;
|
|
- int i;
|
|
+ unsigned int i;
|
|
int err = 0;
|
|
|
|
for (i = 0; i < n_flags_msglvl; i++)
|
|
@@ -3671,7 +3671,7 @@ static int do_grxfh(struct cmd_context *ctx)
|
|
struct ethtool_rxfh *rss;
|
|
u32 rss_context = 0;
|
|
u32 i, indir_bytes;
|
|
- int arg_num = 0;
|
|
+ unsigned int arg_num = 0;
|
|
char *hkey;
|
|
int err;
|
|
|
|
@@ -4832,9 +4832,8 @@ static int do_gtunable(struct cmd_context *ctx)
|
|
{
|
|
struct ethtool_tunable_info *tinfo = tunables_info;
|
|
char **argp = ctx->argp;
|
|
- int argc = ctx->argc;
|
|
- int i;
|
|
- int j;
|
|
+ unsigned int argc = ctx->argc;
|
|
+ unsigned int i, j;
|
|
|
|
if (argc < 1)
|
|
exit_bad_args();
|
|
@@ -4876,7 +4875,7 @@ static int do_gtunable(struct cmd_context *ctx)
|
|
|
|
static int do_get_phy_tunable(struct cmd_context *ctx)
|
|
{
|
|
- int argc = ctx->argc;
|
|
+ unsigned int argc = ctx->argc;
|
|
char **argp = ctx->argp;
|
|
|
|
if (argc < 1)
|
|
@@ -4980,9 +4979,9 @@ static int do_reset(struct cmd_context *ctx)
|
|
{
|
|
struct ethtool_value resetinfo;
|
|
__u32 data;
|
|
- int argc = ctx->argc;
|
|
+ unsigned int argc = ctx->argc;
|
|
char **argp = ctx->argp;
|
|
- int i;
|
|
+ unsigned int i;
|
|
|
|
if (argc == 0)
|
|
exit_bad_args();
|
|
@@ -5270,7 +5269,8 @@ static int do_sfec(struct cmd_context *ctx)
|
|
enum { ARG_NONE, ARG_ENCODING } state = ARG_NONE;
|
|
struct ethtool_fecparam feccmd;
|
|
int fecmode = 0, newmode;
|
|
- int rv, i;
|
|
+ unsigned int i;
|
|
+ int rv;
|
|
|
|
for (i = 0; i < ctx->argc; i++) {
|
|
if (!strcmp(ctx->argp[i], "encoding")) {
|
|
diff --git a/internal.h b/internal.h
|
|
index 8ae1efab5b5c..d096a28abfa2 100644
|
|
--- a/internal.h
|
|
+++ b/internal.h
|
|
@@ -221,7 +221,7 @@ struct cmd_context {
|
|
const char *devname; /* net device name */
|
|
int fd; /* socket suitable for ethtool ioctl */
|
|
struct ifreq ifr; /* ifreq suitable for ethtool ioctl */
|
|
- int argc; /* number of arguments to the sub-command */
|
|
+ unsigned int argc; /* number of arguments to the sub-command */
|
|
char **argp; /* arguments to the sub-command */
|
|
unsigned long debug; /* debugging mask */
|
|
bool json; /* Output JSON, if supported */
|
|
--
|
|
2.26.2
|
|
|