On Wed, Nov 14, 2018 at 03:22:49PM -0700, Theo de Raadt wrote:
> Klemens Nanni <[email protected]> wrote:
>
> > Thus I'd like to remove error checks that are never hit and use
> > sizeof(source) instead of hardcoded IFNAMSIZ while there.
>
> Never use sizeof(source). Always use sizeof(dest). Which it appears
> you did.
Ouch, of course that's an error in my mail - they all do use the
destination's size for good.
> I'm not sure I see the point of the (void) casts. In my experience this is
> a useless syntax which fails to indicate if someone recently reviewed it
> for correctness.
This is used to indicate that the otherwise relevant return value can be
safely ignored but as you said.. I can just leave it out, no problem.
Feedback? OK?
Index: ifconfig.c
===================================================================
RCS file: /cvs/src/sbin/ifconfig/ifconfig.c,v
retrieving revision 1.382
diff -u -p -r1.382 ifconfig.c
--- ifconfig.c 12 Nov 2018 23:40:37 -0000 1.382
+++ ifconfig.c 14 Nov 2018 22:37:08 -0000
@@ -1568,14 +1568,13 @@ setifgroup(const char *group_name, int d
struct ifgroupreq ifgr;
memset(&ifgr, 0, sizeof(ifgr));
- strlcpy(ifgr.ifgr_name, name, IFNAMSIZ);
+ strlcpy(ifgr.ifgr_name, name, sizeof(ifgr.ifgr_name));
if (group_name[0] &&
isdigit((unsigned char)group_name[strlen(group_name) - 1]))
errx(1, "setifgroup: group names may not end in a digit");
- if (strlcpy(ifgr.ifgr_group, group_name, IFNAMSIZ) >= IFNAMSIZ)
- errx(1, "setifgroup: group name too long");
+ strlcpy(ifgr.ifgr_group, group_name, sizeof(ifgr.ifgr_group));
if (ioctl(s, SIOCAIFGROUP, (caddr_t)&ifgr) == -1) {
if (errno != EEXIST)
err(1," SIOCAIFGROUP");
@@ -1589,14 +1588,13 @@ unsetifgroup(const char *group_name, int
struct ifgroupreq ifgr;
memset(&ifgr, 0, sizeof(ifgr));
- strlcpy(ifgr.ifgr_name, name, IFNAMSIZ);
+ strlcpy(ifgr.ifgr_name, name, sizeof(ifgr.ifgr_name));
if (group_name[0] &&
isdigit((unsigned char)group_name[strlen(group_name) - 1]))
errx(1, "unsetifgroup: group names may not end in a digit");
- if (strlcpy(ifgr.ifgr_group, group_name, IFNAMSIZ) >= IFNAMSIZ)
- errx(1, "unsetifgroup: group name too long");
+ strlcpy(ifgr.ifgr_group, group_name, sizeof(ifgr.ifgr_group));
if (ioctl(s, SIOCDIFGROUP, (caddr_t)&ifgr) == -1)
err(1, "SIOCDIFGROUP");
}
@@ -3564,7 +3562,6 @@ settunneladdr(const char *addr, int igno
{
struct addrinfo hints, *res;
struct if_laddrreq req;
- ssize_t len;
int rv;
memset(&hints, 0, sizeof(hints));
@@ -3578,9 +3575,7 @@ settunneladdr(const char *addr, int igno
errx(1, "tunneladdr %s: %s", addr, gai_strerror(rv));
memset(&req, 0, sizeof(req));
- len = strlcpy(req.iflr_name, name, sizeof(req.iflr_name));
- if (len >= sizeof(req.iflr_name))
- errx(1, "%s: Interface name too long", name);
+ strlcpy(req.iflr_name, name, sizeof(req.iflr_name));
memcpy(&req.addr, res->ai_addr, res->ai_addrlen);
@@ -3667,9 +3662,7 @@ settunnelnodf(const char *ignored, int a
void
setvnetflowid(const char *ignored, int alsoignored)
{
- if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >=
- sizeof(ifr.ifr_name))
- errx(1, "vnetflowid: name is too long");
+ strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
ifr.ifr_vnetid = 1;
if (ioctl(s, SIOCSVNETFLOWID, &ifr) < 0)
@@ -3679,9 +3672,7 @@ setvnetflowid(const char *ignored, int a
void
delvnetflowid(const char *ignored, int alsoignored)
{
- if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >=
- sizeof(ifr.ifr_name))
- errx(1, "vnetflowid: name is too long");
+ strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
ifr.ifr_vnetid = 0;
if (ioctl(s, SIOCSVNETFLOWID, &ifr) < 0)
@@ -3877,9 +3868,7 @@ setmpwcontrolword(const char *value, int
void
getvnetflowid(struct ifencap *ife)
{
- if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >=
- sizeof(ifr.ifr_name))
- errx(1, "vnetflowid: name is too long");
+ strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGVNETFLOWID, &ifr) == -1)
return;
@@ -3920,9 +3909,7 @@ delvnetid(const char *ignored, int alsoi
void
getvnetid(struct ifencap *ife)
{
- if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >=
- sizeof(ifr.ifr_name))
- errx(1, "vnetid: name is too long");
+ strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGVNETID, &ifr) == -1) {
if (errno != EADDRNOTAVAIL)
@@ -3946,9 +3933,7 @@ setifparent(const char *id, int param)
{
struct if_parent ifp;
- if (strlcpy(ifp.ifp_name, name, sizeof(ifp.ifp_name)) >=
- sizeof(ifp.ifp_name))
- errx(1, "parent: name too long");
+ strlcpy(ifp.ifp_name, name, sizeof(ifp.ifp_name));
if (strlcpy(ifp.ifp_parent, id, sizeof(ifp.ifp_parent)) >=
sizeof(ifp.ifp_parent))
@@ -3972,9 +3957,7 @@ getifparent(struct ifencap *ife)
struct if_parent ifp;
memset(&ifp, 0, sizeof(ifp));
- if (strlcpy(ifp.ifp_name, name, sizeof(ifp.ifp_name)) >=
- sizeof(ifp.ifp_name))
- errx(1, "parent: name too long");
+ strlcpy(ifp.ifp_name, name, sizeof(ifp.ifp_name));
if (ioctl(s, SIOCGIFPARENT, (caddr_t)&ifp) == -1) {
if (errno != EADDRNOTAVAIL)
@@ -3992,9 +3975,7 @@ getifparent(struct ifencap *ife)
void
gettxprio(struct ifencap *ife)
{
- if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >=
- sizeof(ifr.ifr_name))
- errx(1, "hdr prio: name is too long");
+ strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGTXHPRIO, (caddr_t)&ifr) == -1)
return;
@@ -4008,9 +3989,7 @@ settxprio(const char *val, int d)
{
const char *errmsg = NULL;
- if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >=
- sizeof(ifr.ifr_name))
- errx(1, "tx prio: name is too long");
+ strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
if (strcmp(val, "packet") == 0)
ifr.ifr_hdrprio = IF_HDRPRIO_PACKET;
@@ -6022,7 +6001,7 @@ getifgroups(void)
struct ifg_req *ifg;
memset(&ifgr, 0, sizeof(ifgr));
- strlcpy(ifgr.ifgr_name, name, IFNAMSIZ);
+ strlcpy(ifgr.ifgr_name, name, sizeof(ifgr.ifgr_name));
if (ioctl(s, SIOCGIFGROUP, (caddr_t)&ifgr) == -1) {
if (errno == EINVAL || errno == ENOTTY)