Module Name:    src
Committed By:   maxv
Date:           Tue Jan  7 06:14:43 UTC 2020

Modified Files:
        src/sys/netsmb: smb_smb.c

Log Message:
Set 'ntencpass' to NULL as part of 'again', to prevent use-after-free.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/netsmb/smb_smb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netsmb/smb_smb.c
diff -u src/sys/netsmb/smb_smb.c:1.34 src/sys/netsmb/smb_smb.c:1.35
--- src/sys/netsmb/smb_smb.c:1.34	Mon Sep  3 16:29:36 2018
+++ src/sys/netsmb/smb_smb.c	Tue Jan  7 06:14:42 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_smb.c,v 1.34 2018/09/03 16:29:36 riastradh Exp $	*/
+/*	$NetBSD: smb_smb.c,v 1.35 2020/01/07 06:14:42 maxv Exp $	*/
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_smb.c,v 1.34 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_smb.c,v 1.35 2020/01/07 06:14:42 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -262,7 +262,7 @@ smb_smb_ssnsetup(struct smb_vc *vcp, str
 	struct smb_rq *rqp;
 	struct mbchain *mbp;
 	const smb_unichar *unipp;
-	smb_uniptr ntencpass = NULL;
+	smb_uniptr ntencpass;
 	char *up, *pbuf, *encpass;
 	const char *pp;
 	int error, plen, uniplen, ulen, upper;
@@ -272,7 +272,7 @@ smb_smb_ssnsetup(struct smb_vc *vcp, str
 	upper = 0;
 
 again:
-
+	ntencpass = NULL;
 	vcp->vc_smbuid = SMB_UID_UNKNOWN;
 
 	error = smb_rq_alloc(VCTOCP(vcp), SMB_COM_SESSION_SETUP_ANDX, scred, &rqp);

Reply via email to