diff options
| author | zec <zec@FreeBSD.org> | 2009-08-24 10:09:30 +0000 |
|---|---|---|
| committer | zec <zec@FreeBSD.org> | 2009-08-24 10:09:30 +0000 |
| commit | 19bb42c4683c0b8129df0c1807d6980d4535679d (patch) | |
| tree | 5ba9dcd2e54bc9abd1d333c3fb6c2e11842ff46f /sys/rpc/svc_dg.c | |
| parent | fb1931d971247184022a15dd9f7150669e17efe6 (diff) | |
| download | FreeBSD-src-19bb42c4683c0b8129df0c1807d6980d4535679d.zip FreeBSD-src-19bb42c4683c0b8129df0c1807d6980d4535679d.tar.gz | |
Fix NFS panics with options VIMAGE kernels by apropriately setting curvnet
context inside the RPC code.
Temporarily set td's cred to mount's cred before calling socreate() via
__rpc_nconf2socket().
Submitted by: rmacklem (in part)
Reviewed by: rmacklem, rwatson
Discussed with: dfr, bz
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
Diffstat (limited to 'sys/rpc/svc_dg.c')
| -rw-r--r-- | sys/rpc/svc_dg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/rpc/svc_dg.c b/sys/rpc/svc_dg.c index 0747d1d..9d7696b 100644 --- a/sys/rpc/svc_dg.c +++ b/sys/rpc/svc_dg.c @@ -57,6 +57,8 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/uio.h> +#include <net/vnet.h> + #include <rpc/rpc.h> #include <rpc/rpc_com.h> @@ -101,8 +103,10 @@ svc_dg_create(SVCPOOL *pool, struct socket *so, size_t sendsize, struct sockaddr* sa; int error; + CURVNET_SET(so->so_vnet); if (!__rpc_socket2sockinfo(so, &si)) { printf(svc_dg_str, svc_dg_err1); + CURVNET_RESTORE(); return (NULL); } /* @@ -112,6 +116,7 @@ svc_dg_create(SVCPOOL *pool, struct socket *so, size_t sendsize, recvsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsize); if ((sendsize == 0) || (recvsize == 0)) { printf(svc_dg_str, svc_dg_err2); + CURVNET_RESTORE(); return (NULL); } @@ -124,6 +129,7 @@ svc_dg_create(SVCPOOL *pool, struct socket *so, size_t sendsize, xprt->xp_ops = &svc_dg_ops; error = so->so_proto->pr_usrreqs->pru_sockaddr(so, &sa); + CURVNET_RESTORE(); if (error) goto freedata; |
