diff options
| author |   blambert <blambert@openbsd.org> | 2010-07-02 02:40:15 +0000 |
|---|---|---|
| committer | blambert <blambert@openbsd.org> | 2010-07-02 02:40:15 +0000 |
| commit | 41b18b7efaec5eccb1adb3e63aeb9377f4c90ebf (patch) | |
| tree | 302d91ce246e0922e434bf95ecec888dab2647f8 /sys/netinet/ip_output.c | |
| parent | braces define scope, not indentation. found hunting uninit bugs. ok oga (diff) | |
| download | wireguard-openbsd-41b18b7efaec5eccb1adb3e63aeb9377f4c90ebf.tar.xz wireguard-openbsd-41b18b7efaec5eccb1adb3e63aeb9377f4c90ebf.zip | |
m_copyback can fail to allocate memory, but is a void fucntion so gymnastics
are required to detect that.
Change the function to take a wait argument (used in nfs server, but
M_NOWAIT everywhere else for now) and to return an error
ok claudio@ henning@ krw@
Diffstat (limited to 'sys/netinet/ip_output.c')
| -rw-r--r-- | sys/netinet/ip_output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 63fc01c870d..fc8ebc17d1d 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.207 2010/07/01 02:09:45 reyk Exp $ */ +/* $OpenBSD: ip_output.c,v 1.208 2010/07/02 02:40:16 blambert Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -1634,7 +1634,7 @@ ip_ctloutput(op, so, level, optname, mp) m->m_len = len; *mtod(m, u_int16_t *) = ipr->ref_type; m_copyback(m, sizeof(u_int16_t), ipr->ref_len, - ipr + 1); + ipr + 1, M_NOWAIT); } #endif break; @@ -2151,7 +2151,7 @@ in_delayed_cksum(struct mbuf *m) } if ((offset + sizeof(u_int16_t)) > m->m_len) - m_copyback(m, offset, sizeof(csum), &csum); + m_copyback(m, offset, sizeof(csum), &csum, M_NOWAIT); else *(u_int16_t *)(mtod(m, caddr_t) + offset) = csum; } |