From 64aee5979f08f78bdbff4796d592b0fa1524876d Mon Sep 17 00:00:00 2001 From: Henning Brauer Date: Sat, 5 Jan 2008 19:08:20 +0000 Subject: make sure all callers of rtlabel_id2name check for a null return value. all the original ones did, the recently added ones for labels per interface didn't. no cookie for reyk ;( ok deraadt --- sys/net/if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/net/if.c') diff --git a/sys/net/if.c b/sys/net/if.c index 7068202e0d7..272c773336c 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.167 2008/01/05 07:26:04 deraadt Exp $ */ +/* $OpenBSD: if.c,v 1.168 2008/01/05 19:08:19 henning Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -1290,8 +1290,8 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) break; case SIOCGIFRTLABEL: - if (ifp->if_rtlabelid) { - label = rtlabel_id2name(ifp->if_rtlabelid); + if (ifp->if_rtlabelid && + (label = rtlabel_id2name(ifp->if_rtlabelid)) != NULL) { strlcpy(ifrtlabelbuf, label, RTLABEL_LEN); error = copyoutstr(ifrtlabelbuf, ifr->ifr_data, RTLABEL_LEN, &bytesdone); -- cgit v1.2.3