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

Return meaningful error code from pf_state_key_attach() and

Browse Source 
pf_state_insert().
This commit is contained in:
Gleb Smirnoff 2013-05-11 18:06:51 +00:00
parent 03911dec5b
commit 5af77b3ebd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/netpfil/pf/pf.c
View File

@ -915,7 +915,7 @@ pf_state_key_attach(struct pf_state_key *skw, struct pf_state_key *sks,
uma_zfree(V_pf_state_key_z, sk);
if (idx == PF_SK_STACK)
pf_detach_state(s);
return (-1); /* collision! */
return (EEXIST); /* collision! */
}
}
PF_HASHROW_UNLOCK(ih);
@ -1072,6 +1072,7 @@ pf_state_insert(struct pfi_kif *kif, struct pf_state_key *skw,
{
struct pf_idhash *ih;
struct pf_state *cur;
int error;
KASSERT(TAILQ_EMPTY(&sks->states[0]) && TAILQ_EMPTY(&sks->states[1]),
("%s: sks not pristine", __func__));
@ -1090,8 +1091,8 @@ pf_state_insert(struct pfi_kif *kif, struct pf_state_key *skw,
s->creatorid = V_pf_status.hostid;
}
if (pf_state_key_attach(skw, sks, s))
return (-1);
if ((error = pf_state_key_attach(skw, sks, s)) != 0)
return (error);
ih = &V_pf_idhash[PF_IDHASH(s)];
PF_HASHROW_LOCK(ih);
@ -1108,7 +1109,7 @@ pf_state_insert(struct pfi_kif *kif, struct pf_state_key *skw,
ntohl(s->creatorid));
}
pf_detach_state(s);
return (-1);
return (EEXIST);
}
LIST_INSERT_HEAD(&ih->states, s, entry);
/* One for keys, one for ID hash. */