proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 21:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipaddress: strengthen check on 'label' input

Browse Source 
As mentioned in the ip-address man page, an address label must
be equal to the device name or prefixed by the device name
followed by a colon. Currently the only check on this input is
to see if the device name appears at the beginning of the label
string.

This commit adds an additional check to ensure label == dev or
continues with a colon.

Signed-off-by: Patrick Talbert <ptalbert@redhat.com>
Suggested-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Patrick Talbert 2018-06-14 15:46:57 +02:00 committed by Stephen Hemminger
parent 5887ff0922
commit cad73425d8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ip/ipaddress.c
View File

@ -2065,6 +2065,16 @@ static bool ipaddr_is_multicast(inet_prefix *a)
return false; return false;
} }
static bool is_valid_label(const char *dev, const char *label)
{
size_t len = strlen(dev);
if (strncmp(label, dev, len) != 0)
return false;
return label[len] == '\0' || label[len] == ':';
}
static int ipaddr_modify(int cmd, int flags, int argc, char **argv) static int ipaddr_modify(int cmd, int flags, int argc, char **argv)
{ {
struct { struct {
@ -2208,8 +2218,10 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv)
fprintf(stderr, "Not enough information: \"dev\" argument is required.\n"); fprintf(stderr, "Not enough information: \"dev\" argument is required.\n");
return -1; return -1;
} }
if (l && matches(d, l) != 0) { if (l && !is_valid_label(d, l)) {
fprintf(stderr, "\"dev\" (%s) must match \"label\" (%s).\n", d, l); fprintf(stderr,
"\"label\" (%s) must match \"dev\" (%s) or be prefixed by \"dev\" with a colon.\n",
l, d);
return -1; return -1;
} }