summaryrefslogtreecommitdiff
path: root/iscsiuio
diff options
context:
space:
mode:
authorLee Duncan <lduncan@suse.com>2017-12-15 11:18:35 -0800
committerLee Duncan <lduncan@suse.com>2017-12-15 11:18:35 -0800
commita7a96131bd2ea342f6def0e46be514baf8037ae8 (patch)
tree082b150538c5d3e2dd314026a316e101f5f490e5 /iscsiuio
parent85f647c4300a888bb6cbc27f33138549cab617e3 (diff)
downloadopen-iscsi-a7a96131bd2ea342f6def0e46be514baf8037ae8.tar.gz
Skip useless strcopy, and validate CIDR length
Remove a useless strcpy() that copies a string onto itself, and ensure the CIDR length "keepbits" is not negative. Found by Qualsys.
Diffstat (limited to 'iscsiuio')
-rw-r--r--iscsiuio/src/unix/iscsid_ipc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c
index 8478f9a..4e3d065 100644
--- a/iscsiuio/src/unix/iscsid_ipc.c
+++ b/iscsiuio/src/unix/iscsid_ipc.c
@@ -143,7 +143,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird)
char *tmp, *tok;
char ipaddr_str[NI_MAXHOST];
char str[INET6_ADDRSTRLEN];
- int keepbits = 0;
+ unsigned long keepbits = 0;
struct in_addr ia;
struct in6_addr ia6;
@@ -156,8 +156,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird)
tmp = ipaddr_str;
tok = strsep(&tmp, "/");
LOG_INFO(PFX "in cidr: bitmask '%s' ip '%s'", tmp, tok);
- keepbits = atoi(tmp);
- strcpy(ipaddr_str, tok);
+ keepbits = strtoull(tmp, NULL, 10);
}
/* Determine if the IP address passed from the iface file is