01/01: gnu: ntfs-3g: Fix patch for CVE-2017-0358.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit bd1450f1e4088f6cf21e61b71c305c39f4934e7d
Author: Leo Famulari <address@hidden>
Date:   Sat Feb 18 14:18:15 2017 -0500

    gnu: ntfs-3g: Fix patch for CVE-2017-0358.
    
    This is a followup to commit 1a82ba660e88e731841882523084e5d878267b53.
    
    * gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch: Make patch apply.
---
 gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch | 33 ++++++++++++------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch 
b/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch
index 6edd676..83c9dbb 100644
--- a/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch
+++ b/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch
@@ -2,25 +2,26 @@ Fix CVE-2017-0358:
 http://seclists.org/oss-sec/2017/q1/259
 This patch was copied from the above URL.
 
-diff -ur ntfs-3g.old/src/lowntfs-3g.c ntfs-3g/src/lowntfs-3g.c
---- ntfs-3g.old/src/lowntfs-3g.c       2017-02-09 15:01:04.074331542 -0500
-+++ ntfs-3g/src/lowntfs-3g.c   2017-02-09 15:06:35.757580937 -0500
-@@ -3827,13 +3827,14 @@
-       struct stat st;
-       pid_t pid;
-       const char *cmd = "/sbin/modprobe";
+diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
+index 0bb38f9..c6d1dad 100644
+--- a/src/lowntfs-3g.c
++++ b/src/lowntfs-3g.c
+@@ -3827,13 +3827,14 @@ static fuse_fstype load_fuse_module(void)
+       struct stat st;
+       pid_t pid;
+       const char *cmd = "/sbin/modprobe";
 +      char *env = (char*)NULL;
-       struct timespec req = { 0, 100000000 };   /* 100 msec */
-       fuse_fstype fstype;
-        
-       if (!stat(cmd, &st) && !geteuid()) {
-               pid = fork();
-               if (!pid) {
+       struct timespec req = { 0, 100000000 };   /* 100 msec */
+       fuse_fstype fstype;
+         
+       if (!stat(cmd, &st) && !geteuid()) {
+               pid = fork();
+               if (!pid) {
 -                      execl(cmd, cmd, "fuse", NULL);
 +                      execle(cmd, cmd, "fuse", NULL, &env);
-                       _exit(1);
-               } else if (pid != -1)
-                       waitpid(pid, NULL, 0);
+                       _exit(1);
+               } else if (pid != -1)
+                       waitpid(pid, NULL, 0);
 diff -ur ntfs-3g.old/src/ntfs-3g.c ntfs-3g/src/ntfs-3g.c
 --- ntfs-3g.old/src/ntfs-3g.c  2017-02-09 15:01:04.074331542 -0500
 +++ ntfs-3g/src/ntfs-3g.c      2017-02-09 15:06:26.077252571 -0500