summaryrefslogtreecommitdiffstats
path: root/sys/netinet6/ip6_output.c
diff options
context:
space:
mode:
authorgnn <gnn@FreeBSD.org>2005-05-15 02:28:30 +0000
committergnn <gnn@FreeBSD.org>2005-05-15 02:28:30 +0000
commitc853caca3e5fddae2276561f74356a4ec54783e0 (patch)
tree0bf3963d121c2edbe8546d00ad1b734f627e3ec4 /sys/netinet6/ip6_output.c
parent73f56fbd1534693ebd2437de00078408de2b3851 (diff)
downloadFreeBSD-src-c853caca3e5fddae2276561f74356a4ec54783e0.zip
FreeBSD-src-c853caca3e5fddae2276561f74356a4ec54783e0.tar.gz
Fixes for various nits found by the Coverity tool.
In particular 2 missed return values and an inappropriate bcopy from a possibly NULL pointer. Reviewed by: jake Approved by: rwatson MFC after: 1 week
Diffstat (limited to 'sys/netinet6/ip6_output.c')
-rw-r--r--sys/netinet6/ip6_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 36cfb28..265bd9e 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -2603,7 +2603,7 @@ ip6_copypktopts(src, canwait)
if (src->ip6po_nexthop) {
dst->ip6po_nexthop = malloc(src->ip6po_nexthop->sa_len,
M_IP6OPT, canwait);
- if (dst->ip6po_nexthop == NULL && canwait == M_NOWAIT)
+ if (dst->ip6po_nexthop == NULL)
goto bad;
bcopy(src->ip6po_nexthop, dst->ip6po_nexthop,
src->ip6po_nexthop->sa_len);
OpenPOWER on IntegriCloud