diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2016-05-16 00:25:24 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2016-05-16 00:25:24 +0000 |
| commit | c871174916da0601196d2e1f8ace6a63838e850e (patch) | |
| tree | 1076cbb0355b5f48b1303d093d224e97b4e9c118 /sbin/ifconfig/ifmac.c | |
| parent | e6e244562252798faf891dd77a94209fee8249cd (diff) | |
| download | src-c871174916da0601196d2e1f8ace6a63838e850e.tar.gz src-c871174916da0601196d2e1f8ace6a63838e850e.zip | |
Use strlcpy() instead of strncpy() when copying ifname to ensure
that it is NUL terminated. Additional NUL padding is not required
for short names.
Use sizeof(destination) in a few places instead of IFNAMSIZ.
Cast afp->af_ridreq and afp->af_addreq to make the intent of
the code more obvious.
Reported by: Coverity
CID: 1009628, 1009630, 1009631, 1009632, 1009633, 1009635, 1009638
CID: 1009639, 1009640, 1009641, 1009642, 1009643, 1009644, 1009645
CID: 1009646, 1009647, 1010049, 1010050, 1010051, 1010052, 1010053
CID: 1010054, 1011293, 1011294, 1011295, 1011296, 1011297, 1011298
CID: 1011299, 1305821, 1351720, 1351721
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=299873
Diffstat (limited to 'sbin/ifconfig/ifmac.c')
| -rw-r--r-- | sbin/ifconfig/ifmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c index a8bef817f8f0..3b171ea0bae5 100644 --- a/sbin/ifconfig/ifmac.c +++ b/sbin/ifconfig/ifmac.c @@ -57,7 +57,7 @@ maclabel_status(int s) char *label_text; memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); if (mac_prepare_ifnet_label(&label) == -1) return; @@ -90,7 +90,7 @@ setifmaclabel(const char *val, int d, int s, const struct afswtch *rafp) } memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); ifr.ifr_ifru.ifru_data = (void *)label; error = ioctl(s, SIOCSIFMAC, &ifr); |