31c31
< __FBSDID("$FreeBSD: head/sys/netpfil/ipfw/ip_fw_sockopt.c 290330 2015-11-03 10:21:53Z ae $");
---
> __FBSDID("$FreeBSD: head/sys/netpfil/ipfw/ip_fw_sockopt.c 290332 2015-11-03 10:29:46Z ae $");
2159,2160c2159,2160
< static int
< check_object_name(ipfw_obj_ntlv *ntlv)
---
> int
> ipfw_check_object_name_generic(const char *name)
2162c2162
< int error;
---
> int nsize;
2164,2171c2164,2168
< switch (ntlv->head.type) {
< case IPFW_TLV_TBL_NAME:
< error = ipfw_check_table_name(ntlv->name);
< break;
< default:
< error = ENOTSUP;
< }
<
---
> nsize = sizeof(((ipfw_obj_ntlv *)0)->name);
> if (strnlen(name, nsize) == nsize)
> return (EINVAL);
> if (name[0] == '\0')
> return (EINVAL);
2486c2483
< error = check_object_name(ntlv);
---
> error = ipfw_check_object_name_generic(ntlv->name);