Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the right key, "ifcaps" not "ifcap", in do_setifcaps(). assert()

Browse Source 
that the object associated with that key is the right size.
This commit is contained in:
dyoung 2008-05-06 21:58:05 +00:00
parent 93d3122a7c
commit f32d909d6e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/ifconfig/ifconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ifconfig.c,v 1.192 2008/05/06 21:20:05 dyoung Exp $ */
/* $NetBSD: ifconfig.c,v 1.193 2008/05/06 21:58:05 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@ -69,7 +69,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
#else
__RCSID("$NetBSD: ifconfig.c,v 1.192 2008/05/06 21:20:05 dyoung Exp $");
__RCSID("$NetBSD: ifconfig.c,v 1.193 2008/05/06 21:58:05 dyoung Exp $");
#endif
#endif /* not lint */
@ -571,10 +571,12 @@ do_setifcaps(int s, const char *ifname, prop_dictionary_t env)
struct ifcapreq ifcr;
prop_data_t d;
d = (prop_data_t )prop_dictionary_get(env, "ifcap");
if (d == NULL || sizeof(ifcr) != prop_data_size(d))
d = (prop_data_t )prop_dictionary_get(env, "ifcaps");
if (d == NULL)
return;
assert(sizeof(ifcr) == prop_data_size(d));
memcpy(&ifcr, prop_data_data_nocopy(d), sizeof(ifcr));
estrlcpy(ifcr.ifcr_name, ifname, sizeof(ifcr.ifcr_name));
if (ioctl(s, SIOCSIFCAP, &ifcr) == -1)