xnu-6153.121.1.tar.gz

[apple/xnu.git] / bsd / net / pf_ioctl.c

diff --git a/bsd/net/pf_ioctl.c b/bsd/net/pf_ioctl.c
index 560dee4ab465117f3792fb93975f4537bcb22779..9ba6cc70c3604e98bdb3e0cd66f9d1d2eab48ed0 100644 (file)
--- a/bsd/net/pf_ioctl.c
+++ b/bsd/net/pf_ioctl.c
@@ -1127,6 +1127,7 @@ pf_rule_copyin(struct pf_rule *src, struct pf_rule *dst, struct proc *p,
        dst->tagname[sizeof(dst->tagname) - 1] = '\0';
        dst->match_tagname[sizeof(dst->match_tagname) - 1] = '\0';
        dst->overload_tblname[sizeof(dst->overload_tblname) - 1] = '\0';
        dst->tagname[sizeof(dst->tagname) - 1] = '\0';
        dst->match_tagname[sizeof(dst->match_tagname) - 1] = '\0';
        dst->overload_tblname[sizeof(dst->overload_tblname) - 1] = '\0';

+       dst->owner[sizeof(dst->owner) - 1] = '\0';

 
        dst->cuid = kauth_cred_getuid(p->p_ucred);
        dst->cpid = p->p_pid;
 
        dst->cuid = kauth_cred_getuid(p->p_ucred);
        dst->cpid = p->p_pid;


@@ -1158,7 +1159,8 @@ pf_rule_copyout(struct pf_rule *src, struct pf_rule *dst)
        dst->kif = NULL;
        dst->overload_tbl = NULL;
 
        dst->kif = NULL;
        dst->overload_tbl = NULL;
 

-       TAILQ_INIT(&dst->rpool.list);
+       dst->rpool.list.tqh_first = NULL;
+       dst->rpool.list.tqh_last = NULL;

        dst->rpool.cur = NULL;
 
        dst->entries.tqe_prev = NULL;
        dst->rpool.cur = NULL;
 
        dst->entries.tqe_prev = NULL;