aboutsummaryrefslogtreecommitdiff
path: root/sys/netgraph
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2005-02-03 12:50:10 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2005-02-03 12:50:10 +0000
commitbbb75d78443429fdfa6f977108a2df7b8f1d643a (patch)
treed24165c984e709df9f05c60e3bc71cc46df936e1 /sys/netgraph
parentc60878f0d266f8f94f66f99e7fcc2f108cd8309e (diff)
downloadsrc-bbb75d78443429fdfa6f977108a2df7b8f1d643a.tar.gz
src-bbb75d78443429fdfa6f977108a2df7b8f1d643a.zip
Fixed an off-by-one error when dealing with interface name
(if_xname is IFNAMSIZ-sized and NUL-terminated).
Notes
Notes: svn path=/head/; revision=141195
Diffstat (limited to 'sys/netgraph')
-rw-r--r--sys/netgraph/ng_eiface.c4
-rw-r--r--sys/netgraph/ng_ether.c4
-rw-r--r--sys/netgraph/ng_gif.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 6f15714c08cb..6a711cab8699 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -524,12 +524,12 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook)
}
case NGM_EIFACE_GET_IFNAME:
- NG_MKRESPONSE(resp, msg, IFNAMSIZ + 1, M_NOWAIT);
+ NG_MKRESPONSE(resp, msg, IFNAMSIZ, M_NOWAIT);
if (resp == NULL) {
error = ENOMEM;
break;
}
- strlcpy(resp->data, ifp->if_xname, IFNAMSIZ + 1);
+ strlcpy(resp->data, ifp->if_xname, IFNAMSIZ);
break;
case NGM_EIFACE_GET_IFADDRS:
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index a3932a19a660..12ab4db9050e 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -420,12 +420,12 @@ ng_ether_rcvmsg(node_p node, item_p item, hook_p lasthook)
case NGM_ETHER_COOKIE:
switch (msg->header.cmd) {
case NGM_ETHER_GET_IFNAME:
- NG_MKRESPONSE(resp, msg, IFNAMSIZ + 1, M_NOWAIT);
+ NG_MKRESPONSE(resp, msg, IFNAMSIZ, M_NOWAIT);
if (resp == NULL) {
error = ENOMEM;
break;
}
- strlcpy(resp->data, priv->ifp->if_xname, IFNAMSIZ + 1);
+ strlcpy(resp->data, priv->ifp->if_xname, IFNAMSIZ);
break;
case NGM_ETHER_GET_IFINDEX:
NG_MKRESPONSE(resp, msg, sizeof(u_int32_t), M_NOWAIT);
diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c
index 605c7f208d29..631d0586e055 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -406,12 +406,12 @@ ng_gif_rcvmsg(node_p node, item_p item, hook_p lasthook)
case NGM_GIF_COOKIE:
switch (msg->header.cmd) {
case NGM_GIF_GET_IFNAME:
- NG_MKRESPONSE(resp, msg, IFNAMSIZ + 1, M_NOWAIT);
+ NG_MKRESPONSE(resp, msg, IFNAMSIZ, M_NOWAIT);
if (resp == NULL) {
error = ENOMEM;
break;
}
- strlcpy(resp->data, priv->ifp->if_xname, IFNAMSIZ + 1);
+ strlcpy(resp->data, priv->ifp->if_xname, IFNAMSIZ);
break;
case NGM_GIF_GET_IFINDEX:
NG_MKRESPONSE(resp, msg, sizeof(u_int32_t), M_NOWAIT);