diff options
author | Martin Väth <martin@mvath.de> | 2017-03-20 09:12:14 +0100 |
---|---|---|
committer | Martin Väth <martin@mvath.de> | 2017-03-20 09:12:14 +0100 |
commit | dcc26d65487104141e4af08e749d267fee1afd1d (patch) | |
tree | 33671b2c0162110e76698465da7eca2e2cd2a7ed /sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch | |
parent | app-misc/knapsack: Version bump (diff) | |
download | mv-dcc26d65487104141e4af08e749d267fee1afd1d.tar.gz mv-dcc26d65487104141e4af08e749d267fee1afd1d.tar.bz2 mv-dcc26d65487104141e4af08e749d267fee1afd1d.zip |
sys-fs/squashfs-tools: Version bump
Diffstat (limited to 'sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch')
-rw-r--r-- | sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch deleted file mode 100644 index a9b00014..00000000 --- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch +++ /dev/null @@ -1,35 +0,0 @@ -taken from Fedora - -From 604b607d8ac91eb8afc0b6e3d917d5c073096103 Mon Sep 17 00:00:00 2001 -From: Phillip Lougher <phillip@squashfs.org.uk> -Date: Wed, 11 Jun 2014 04:51:37 +0100 -Subject: mksquashfs: ensure value does not overflow a signed int in -mem - option - -Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk> - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 5370ecf..9676dc8 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -5193,7 +5193,16 @@ print_compressor_options: - argv[0]); - exit(1); - } -- /* convert from bytes to Mbytes */ -+ -+ /* -+ * convert from bytes to Mbytes, ensuring the value -+ * does not overflow a signed int -+ */ -+ if(number >= (1LL << 51)) { -+ ERROR("%s: -mem invalid mem size\n", argv[0]); -+ exit(1); -+ } -+ - total_mem = number / 1048576; - if(total_mem < (SQUASHFS_LOWMEM / SQUASHFS_TAKE)) { - ERROR("%s: -mem should be %d Mbytes or " --- -cgit v0.10.1 - |