mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: mtools: 'mformat' initializes boot sector before writing it.
This is the last bit fixing <https://bugs.gnu.org/35283>. Previously, 'mformat' (used by 'grub-mkrescue') would pass uninitialized bytes to write(2), leading to non-deterministic FAT image contents. This patch fixes that. * gnu/packages/patches/mtools-mformat-uninitialized.patch: New file. * gnu/packages/mtools.scm (mtools)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
parent
5502fbd7fd
commit
1b0b1651b1
3 changed files with 33 additions and 10 deletions
|
@ -1078,6 +1078,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/mozjs38-tracelogger.patch \
|
%D%/packages/patches/mozjs38-tracelogger.patch \
|
||||||
%D%/packages/patches/mozjs38-version-detection.patch \
|
%D%/packages/patches/mozjs38-version-detection.patch \
|
||||||
%D%/packages/patches/mrrescue-support-love-11.patch \
|
%D%/packages/patches/mrrescue-support-love-11.patch \
|
||||||
|
%D%/packages/patches/mtools-mformat-uninitialized.patch \
|
||||||
%D%/packages/patches/mumble-1.2.19-abs.patch \
|
%D%/packages/patches/mumble-1.2.19-abs.patch \
|
||||||
%D%/packages/patches/mumps-build-parallelism.patch \
|
%D%/packages/patches/mumps-build-parallelism.patch \
|
||||||
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
|
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013 John Darrington <jmd@gnu.org>
|
;;; Copyright © 2013 John Darrington <jmd@gnu.org>
|
||||||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2015, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
|
@ -23,20 +23,22 @@ (define-module (gnu packages mtools)
|
||||||
#:use-module (guix licenses)
|
#:use-module (guix licenses)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix build-system gnu))
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (gnu packages))
|
||||||
|
|
||||||
(define-public mtools
|
(define-public mtools
|
||||||
(package
|
(package
|
||||||
(name "mtools")
|
(name "mtools")
|
||||||
(version "4.0.23")
|
(version "4.0.23")
|
||||||
(source
|
(source (origin
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/mtools/mtools-"
|
(uri (string-append "mirror://gnu/mtools/mtools-"
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i"))))
|
"1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i"))
|
||||||
|
(patches
|
||||||
|
(search-patches "mtools-mformat-uninitialized.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(home-page "https://www.gnu.org/software/mtools/")
|
(home-page "https://www.gnu.org/software/mtools/")
|
||||||
(synopsis "Access MS-DOS disks without mounting")
|
(synopsis "Access MS-DOS disks without mounting")
|
||||||
|
|
20
gnu/packages/patches/mtools-mformat-uninitialized.patch
Normal file
20
gnu/packages/patches/mtools-mformat-uninitialized.patch
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
Fix a bug whereby 'mformat' could end up passing uninitialized bytes
|
||||||
|
to write(2). This could be reproduced with:
|
||||||
|
|
||||||
|
mformat -C -f 1440 -L 16 -N 77777777 -i /tmp/x ::
|
||||||
|
|
||||||
|
where the output of /tmp/x would be non-deterministic.
|
||||||
|
|
||||||
|
Patch by Ludovic Courtès <ludo@gnu.org>.
|
||||||
|
|
||||||
|
--- mtools-4.0.23/mformat.c 2019-04-21 00:12:01.496116195 +0200
|
||||||
|
+++ mtools-4.0.23/mformat.c 2019-04-21 00:12:36.675967157 +0200
|
||||||
|
@@ -927,6 +927,7 @@ void mformat(int argc, char **argv, int
|
||||||
|
|
||||||
|
char *endptr;
|
||||||
|
|
||||||
|
+ memset(&boot.bytes, '\0', sizeof boot);
|
||||||
|
hs = hs_set = 0;
|
||||||
|
argtracks = 0;
|
||||||
|
argheads = 0;
|
||||||
|
|
Loading…
Reference in a new issue