matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip: drop 2-char command assumption 

The 'ip' utility hardcodes the assumption of being a 2-char command, where
any follow-on characters are passed as an argument:

  $ ./ip-full help
  Object "-full" is unknown, try "ip help".

This confusing behaviour isn't seen with 'tc' for example, and was added in
a 2005 commit without documentation. It was noticed during testing of 'ip'
variants built/packaged with different feature sets (e.g. w/o BPF support).

Mitigate the problem by redoing the command without the 2-char assumption
if the follow-on characters fail to parse as a valid command.

Fixes: 351efcde4e ("Update header files to 2.6.14")
Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Tony Ambardar 2021-04-20 01:26:36 -07:00 committed by David Ahern
parent 81bfd01a4c
commit e705b19d48
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ip/ip.c
View File

@ -125,7 +125,7 @@ static const struct cmd {
{ 0 } { 0 }
}; };
static int do_cmd(const char *argv0, int argc, char **argv) static int do_cmd(const char *argv0, int argc, char **argv, bool final)
{ {
const struct cmd *c; const struct cmd *c;
@ -134,6 +134,7 @@ static int do_cmd(const char *argv0, int argc, char **argv)
return -(c->func(argc-1, argv+1)); return -(c->func(argc-1, argv+1));
} }
if (final)
fprintf(stderr, "Object \"%s\" is unknown, try \"ip help\".\n", argv0); fprintf(stderr, "Object \"%s\" is unknown, try \"ip help\".\n", argv0);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -143,7 +144,7 @@ static int ip_batch_cmd(int argc, char *argv[], void *data)
const int *orig_family = data; const int *orig_family = data;
preferred_family = *orig_family; preferred_family = *orig_family;
return do_cmd(argv[0], argc, argv); return do_cmd(argv[0], argc, argv, true);
} }
static int batch(const char *name) static int batch(const char *name)
@ -312,11 +313,14 @@ int main(int argc, char **argv)
rtnl_set_strict_dump(&rth); rtnl_set_strict_dump(&rth);
if (strlen(basename) > 2) if (strlen(basename) > 2) {
return do_cmd(basename+2, argc, argv); int ret = do_cmd(basename+2, argc, argv, false);
if (ret != EXIT_FAILURE)
return ret;
}
if (argc > 1) if (argc > 1)
return do_cmd(argv[1], argc-1, argv+1); return do_cmd(argv[1], argc-1, argv+1, true);
rtnl_close(&rth); rtnl_close(&rth);
usage(); usage();