jengelh/schily
SHA256
1
0
Fork 0
forked from pool/schily
Code Pull Requests Activity

Accepting request 802717 from home:adamm:branches:utilities

Browse Source 
Patch already forwarded upstream

- mkisofs: fix integer overflow in partition table calculation
  when chrp-boot is enabled and a large ISO image is created.
  (large_mac_iso.patch, bsc#1169420)

OBS-URL: https://build.opensuse.org/request/show/802717
OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=93
This commit is contained in:
Jan Engelhardt 2020-05-11 15:26:12 +00:00 committed by Git OBS Bridge
parent 9cec21c81e
commit 12bc16e2c1
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
large_mac_iso.patch Normal file
View File

@ -0,0 +1,33 @@
Index: cdrtools-3.02/mkisofs/mac_label.c
===================================================================
--- cdrtools-3.02.orig/mkisofs/mac_label.c
+++ cdrtools-3.02/mkisofs/mac_label.c
@@ -67,8 +67,8 @@ gen_prepboot_label(ml)
{
struct directory_entry *de;
int i = 0;
- int block;
- int size;
+ unsigned block;
+ unsigned size;
MacLabel *mac_label = (MacLabel *) ml;
if (verbose > 1) {
@@ -98,7 +98,7 @@ gen_prepboot_label(ml)
mac_label->image[i].startSect[2] = 0;
mac_label->image[i].startSect[3] = 0;
- size = (last_extent - session_start) * 2048 / 512;
+ size = (unsigned)(last_extent - session_start) * (2048 / 512);
mac_label->image[i].size[0] = size & 0xff;
mac_label->image[i].size[1] = (size >> 8) & 0xff;
mac_label->image[i].size[2] = (size >> 16) & 0xff;
@@ -115,7 +115,7 @@ gen_prepboot_label(ml)
/* NOTREACHED */
}
/* get size and block in 512-byte blocks */
- block = get_733(de->isorec.extent) * 2048 / 512;
+ block = get_733(de->isorec.extent) * (2048 / 512);
size = get_733(de->isorec.size) / 512 + 1;
fprintf(stderr, _("PReP boot partition %d is \"%s\"\n"),
i + 1, prep_boot_image[i - use_chrp_boot]);

7
schily.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 11 11:47:23 UTC 2020 - Adam Majer <adam.majer@suse.de>
- mkisofs: fix integer overflow in partition table calculation
when chrp-boot is enabled and a large ISO image is created.
(large_mac_iso.patch, bsc#1169420)
-------------------------------------------------------------------
Wed Apr 29 08:26:30 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

2
schily.spec
View File

@ -41,6 +41,7 @@ Source1: README-FIRST
# and submit patches upstream FIRST (cc to the bspkg maintainer perhaps).
Patch1: iconv-name.diff
Patch2: schily-2018-05-25_star_configuration.patch
Patch3: large_mac_iso.patch
BuildRequires: autoconf
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -447,6 +448,7 @@ GB).
%prep
%setup -qn %name-%rver
%patch -P 1 -P 2 -p1
%patch3 -p1
find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+"
cp %{SOURCE1} .