From e63bffb7b546efa55ca4126ccb0a1fdbe29258871281415c9b828e90f05cba56 Mon Sep 17 00:00:00 2001
From: Aurelien Aptel <aaptel@suse.com>
Date: Wed, 9 Oct 2019 16:13:33 +0000
Subject: [PATCH] Accepting request 736712 from
 home:pauloac:cifs-utils-fix-invalid-free

- Fix invalid free in mount.cifs; (bsc#1152930).
  * add 0012-mount.cifs-Fix-invalid-free.patch

OBS-URL: https://build.opensuse.org/request/show/736712
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=177
---
 0012-mount.cifs-Fix-invalid-free.patch | 77 ++++++++++++++++++++++++++
 cifs-utils.changes                     |  6 ++
 cifs-utils.spec                        |  2 +
 3 files changed, 85 insertions(+)
 create mode 100644 0012-mount.cifs-Fix-invalid-free.patch

diff --git a/0012-mount.cifs-Fix-invalid-free.patch b/0012-mount.cifs-Fix-invalid-free.patch
new file mode 100644
index 0000000..f40990e
--- /dev/null
+++ b/0012-mount.cifs-Fix-invalid-free.patch
@@ -0,0 +1,77 @@
+From d48a8d61c07e3841ffd71f3aafa5db28dd35b6a7 Mon Sep 17 00:00:00 2001
+From: "Paulo Alcantara (SUSE)" <pc@cjr.nz>
+Date: Thu, 19 Sep 2019 08:35:47 -0300
+Subject: [PATCH] mount.cifs: Fix invalid free
+
+When attemping to chdir into non-existing directories, mount.cifs
+crashes.
+
+This patch fixes the following ASAN report:
+
+$ ./mount.cifs //localhost/foo /mnt/invalid-dir -o ...
+/mnt/bar -o username=foo,password=foo,vers=1.0
+Couldn't chdir to /mnt/bar: No such file or directory
+=================================================================
+==11846==ERROR: AddressSanitizer: attempting free on address which was
+not malloc()-ed: 0x7ffd86332e97 in thread T0
+    #0 0x7f0860ca01e7 in
+    __interceptor_free (/usr/lib64/libasan.so.5+0x10a1e7)
+    #1 0x557edece9ccb in
+    acquire_mountpoint (/home/paulo/src/cifs-utils/mount.cifs+0xeccb)
+    #2 0x557edecea63d in
+    main (/home/paulo/src/cifs-utils/mount.cifs+0xf63d)
+    #3 0x7f08609f0bca in __libc_start_main (/lib64/libc.so.6+0x26bca)
+    #4 0x557edece27d9 in
+    _start (/home/paulo/src/cifs-utils/mount.cifs+0x77d9)
+
+Address 0x7ffd86332e97 is located in stack of thread T0 at offset 8951
+in frame
+    #0 0x557edece9ce0 in
+    main (/home/paulo/src/cifs-utils/mount.cifs+0xece0)
+
+  This frame has 2 object(s):
+    [48, 52) 'rc' (line 1959)
+    [64, 72) 'mountpoint' (line 1955) <== Memory access at offset 8951
+    overflows this variable
+HINT: this may be a false positive if your program uses some custom
+stack unwind mechanism, swapcontext or vfork
+      (longjmp and C++ exceptions *are* supported)
+SUMMARY: AddressSanitizer: bad-free (/usr/lib64/libasan.so.5+0x10a1e7)
+in __interceptor_free
+==11846==ABORTING
+
+Fixes: bf7f48f4c7dc ("mount.cifs.c: fix memory leaks in main func")
+Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
+---
+ mount.cifs.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index 7748d54aa814..0c38adcd99b1 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -1893,7 +1893,7 @@ acquire_mountpoint(char **mountpointp)
+ 	int rc, dacrc;
+ 	uid_t realuid, oldfsuid;
+ 	gid_t oldfsgid;
+-	char *mountpoint;
++	char *mountpoint = NULL;
+ 
+ 	/*
+ 	 * Acquire the necessary privileges to chdir to the mountpoint. If
+@@ -1942,9 +1942,9 @@ restore_privs:
+ 		gid_t __attribute__((unused)) gignore = setfsgid(oldfsgid);
+ 	}
+ 
+-	if (rc) {
+-		free(*mountpointp);
+-	}
++	if (rc)
++		free(mountpoint);
++
+ 	return rc;
+ }
+ 
+-- 
+2.23.0
+
diff --git a/cifs-utils.changes b/cifs-utils.changes
index 225dbdb..7d0d5ed 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct  2 20:06:53 UTC 2019 - palcantara@suse.de
+
+- Fix invalid free in mount.cifs; (bsc#1152930).
+  * add 0012-mount.cifs-Fix-invalid-free.patch
+
 -------------------------------------------------------------------
 Mon Sep  9 12:56:24 UTC 2019 - Aurelien Aptel <aaptel@suse.com>
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index f5aecaa..1df1fec 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -43,6 +43,7 @@ Patch7:         0008-mount.cifs.c-fix-memory-leaks-in-main-func.patch
 Patch8:         0009-Zero-fill-the-allocated-memory-for-new-struct-cifs_n.patch
 Patch9:         0010-Zero-fill-the-allocated-memory-for-a-new-ACE.patch
 Patch10:        0011-fix-doublefree.patch
+Patch11:        0012-mount.cifs-Fix-invalid-free.patch
 
 # cifs-utils 6.8 switched to python for man page generation
 # we need to require either py2 or py3 package
@@ -130,6 +131,7 @@ cp -a ${RPM_SOURCE_DIR}/README.cifstab.migration .
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 export CFLAGS="%{optflags} -D_GNU_SOURCE -fpie"