d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Room to hold rules should be dynamically allocated.

Browse Source 
PR:		kern/24248
This commit is contained in:
ume 2001-01-20 22:40:39 +00:00
parent 9f0480156d
commit b1328b8ed8
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sbin/ip6fw/ip6fw.c
View File

@ -37,6 +37,7 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <errno.h>
#include <net/if.h>
#include <netinet/in.h>
@ -410,18 +411,25 @@ list(ac, av)
int ac;
char **av;
{
struct ip6_fw *r;
struct ip6_fw rules[1024];
struct ip6_fw *r, *rules;
int l,i;
unsigned long rulenum;
int bytes;
int nalloc, bytes, maxbytes;
/* extract rules from kernel */
memset(rules,0,sizeof rules);
bytes = sizeof rules;
i = getsockopt(s, IPPROTO_IPV6, IPV6_FW_GET, rules, &bytes);
if (i < 0)
err(2,"getsockopt(IPV6_FW_GET)");
/* extract rules from kernel, resizing array as necessary */
rules = NULL;
nalloc = sizeof *rules;
bytes = nalloc;
maxbytes = 65536 * sizeof *rules;
while (bytes >= nalloc) {
nalloc = nalloc * 2 + 200;
bytes = nalloc;
if ((rules = realloc(rules, bytes)) == NULL)
err(2, "realloc");
i = getsockopt(s, IPPROTO_IPV6, IPV6_FW_GET, rules, &bytes);
if ((i < 0 && errno != EINVAL) || nalloc > maxbytes)
err(2, "getsockopt(IPV6_FW_GET)");
}
if (!ac) {
/* display all rules */
for (r = rules, l = bytes; l >= sizeof rules[0];