Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7-1]: src/sys/netsmb Pull up following revision(s) (requested by ...



details:   https://anonhg.NetBSD.org/src/rev/2f49434d0b82
branches:  netbsd-7-1
changeset: 451138:2f49434d0b82
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 07 18:54:56 2019 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1696):

        sys/netsmb/smb_conn.c: revision 1.30

Prevent a NULL pointer dereference when the local endpoint is not defined.

>From Andy Nguyen, many thanks.

diffstat:

 sys/netsmb/smb_conn.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 5c6a7b422f84 -r 2f49434d0b82 sys/netsmb/smb_conn.c
--- a/sys/netsmb/smb_conn.c     Sun May 05 09:09:04 2019 +0000
+++ b/sys/netsmb/smb_conn.c     Tue May 07 18:54:56 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smb_conn.c,v 1.29 2012/04/29 20:27:31 dsl Exp $        */
+/*     $NetBSD: smb_conn.c,v 1.29.26.1 2019/05/07 18:54:56 martin Exp $        */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_conn.c,v 1.29 2012/04/29 20:27:31 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_conn.c,v 1.29.26.1 2019/05/07 18:54:56 martin Exp $");
 
 /*
  * Connection engine.
@@ -553,7 +553,8 @@
        if ((vcp->vc_paddr = dup_sockaddr(vcspec->sap, 1)) == NULL)
                goto fail;
 
-       if ((vcp->vc_laddr = dup_sockaddr(vcspec->lap, 1)) == NULL)
+       if (vcspec->lap && 
+           (vcp->vc_laddr = dup_sockaddr(vcspec->lap, 1)) == NULL)
                goto fail;
 
        if ((vcp->vc_pass = smb_strdup(vcspec->pass)) == NULL)



Home | Main Index | Thread Index | Old Index