diff options
| author | ume <ume@FreeBSD.org> | 2003-10-30 18:42:25 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2003-10-30 18:42:25 +0000 |
| commit | bc68df01ede63215e4eb2254bd048763b925d04b (patch) | |
| tree | 35f8d39052d651e73f5b688dacf987285af0f19d /sys/netinet6 | |
| parent | a580a14832f1f0612ed4967b4d7cf373e49736ea (diff) | |
| download | FreeBSD-src-bc68df01ede63215e4eb2254bd048763b925d04b.zip FreeBSD-src-bc68df01ede63215e4eb2254bd048763b925d04b.tar.gz | |
- unlock on error.
- don't call malloc with M_WAITOK within lock context.
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6_src.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index cf10c93..b6708de 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -647,6 +647,8 @@ add_addrsel_policyent(newpolicy) { struct addrsel_policyent *new, *pol; + MALLOC(new, struct addrsel_policyent *, sizeof(*new), M_IFADDR, + M_WAITOK); ADDRSEL_LOCK(); /* duplication check */ @@ -656,12 +658,12 @@ add_addrsel_policyent(newpolicy) &pol->ape_policy.addr) && SA6_ARE_ADDR_EQUAL(&newpolicy->addrmask, &pol->ape_policy.addrmask)) { + ADDRSEL_UNLOCK(); + FREE(new, M_IFADDR); return (EEXIST); /* or override it? */ } } - MALLOC(new, struct addrsel_policyent *, sizeof(*new), M_IFADDR, - M_WAITOK); bzero(new, sizeof(*new)); /* XXX: should validate entry */ @@ -690,8 +692,10 @@ delete_addrsel_policyent(key) break; } } - if (pol == NULL) + if (pol == NULL) { + ADDRSEL_UNLOCK(); return (ESRCH); + } TAILQ_REMOVE(&addrsel_policytab, pol, ape_entry); ADDRSEL_UNLOCK(); @@ -710,8 +714,10 @@ walk_addrsel_policy(callback, w) ADDRSEL_LOCK(); for (pol = TAILQ_FIRST(&addrsel_policytab); pol; pol = TAILQ_NEXT(pol, ape_entry)) { - if ((error = (*callback)(&pol->ape_policy, w)) != 0) + if ((error = (*callback)(&pol->ape_policy, w)) != 0) { + ADDRSEL_UNLOCK(); return (error); + } } ADDRSEL_UNLOCK(); |
