Author: dteske
Date: Sun Apr 13 22:00:50 2014
New Revision: 264425
URL: http://svnweb.freebsd.org/changeset/base/264425
Log:
MFC r250243:
If the kernel is compiled with VMIMAGE support, the first attempt of
mounting smbfs share will cause a panic. Fix setting/restoring vnet
context when needed.
PR: kern/168077
Submitted by: dteske
Modified:
stable/9/sys/netsmb/smb_trantcp.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
Modified: stable/9/sys/netsmb/smb_trantcp.c
==============================================================================
--- stable/9/sys/netsmb/smb_trantcp.c Sun Apr 13 21:52:27 2014
(r264424)
+++ stable/9/sys/netsmb/smb_trantcp.c Sun Apr 13 22:00:50 2014
(r264425)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/route.h>
+#include <net/vnet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
@@ -79,13 +80,17 @@ static int
nb_setsockopt_int(struct socket *so, int level, int name, int val)
{
struct sockopt sopt;
+ int error;
bzero(&sopt, sizeof(sopt));
sopt.sopt_level = level;
sopt.sopt_name = name;
sopt.sopt_val = &val;
sopt.sopt_valsize = sizeof(val);
- return sosetopt(so, &sopt);
+ CURVNET_SET(so->so_vnet);
+ error = sosetopt(so, &sopt);
+ CURVNET_RESTORE();
+ return error;
}
static int
@@ -286,8 +291,10 @@ nbssn_recvhdr(struct nbpcb *nbp, int *le
auio.uio_offset = 0;
auio.uio_resid = sizeof(len);
auio.uio_td = td;
+ CURVNET_SET(so->so_vnet);
error = soreceive(so, (struct sockaddr **)NULL, &auio,
(struct mbuf **)NULL, (struct mbuf **)NULL, &flags);
+ CURVNET_RESTORE();
if (error)
return error;
if (auio.uio_resid > 0) {
@@ -371,8 +378,10 @@ nbssn_recv(struct nbpcb *nbp, struct mbu
*/
do {
rcvflg = MSG_WAITALL;
+ CURVNET_SET(so->so_vnet);
error = soreceive(so, (struct sockaddr **)NULL,
&auio, &tm, (struct mbuf **)NULL, &rcvflg);
+ CURVNET_RESTORE();
} while (error == EWOULDBLOCK || error == EINTR ||
error == ERESTART);
if (error)
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
