pool/biosdevname
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 611543 from home:jmoellers:branches:Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/611543
OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=73
This commit is contained in:
Josef Möllers 2018-05-23 13:45:45 +00:00 committed by Git OBS Bridge
parent e7c60eef9a
commit d712577c39
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
biosdevname.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 23 11:32:02 UTC 2018 - josef.moellers@suse.com
- Prevent infinite recursion in dmidecode.c::smbios_setslot by
checking that subordinate bus has a number greater than the
current bus.
[bsc#1093625, dmidecode-prevent-infinite-recursion.patch]
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 27 11:52:38 CEST 2018 - kukuk@suse.de Tue Mar 27 11:52:38 CEST 2018 - kukuk@suse.de

4
biosdevname.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package biosdevname # spec file for package biosdevname
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -30,6 +30,7 @@ Patch2: whitelist-dell
Patch3: udev-rule-path.patch Patch3: udev-rule-path.patch
Patch4: biosdevname-pic.patch Patch4: biosdevname-pic.patch
Patch5: biosdevname-dom0.patch Patch5: biosdevname-dom0.patch
Patch6: dmidecode-prevent-infinite-recursion.patch
BuildRequires: automake BuildRequires: automake
# to figure out how to name/location of the rules file # to figure out how to name/location of the rules file
BuildRequires: libudev-devel BuildRequires: libudev-devel
@ -69,6 +70,7 @@ You can enable/disable usage of biosdevname with boot option
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
%build %build
sed -i -e 's#@@BIOSDEVNAME_RULEDEST@@#'%{_udevrulesdir}'/71-biosdevname.rules#' configure.ac sed -i -e 's#@@BIOSDEVNAME_RULEDEST@@#'%{_udevrulesdir}'/71-biosdevname.rules#' configure.ac

13
dmidecode-prevent-infinite-recursion.patch Normal file
View File

@ -0,0 +1,13 @@
Index: biosdevname-0.7.3/src/dmidecode/dmidecode.c
===================================================================
--- biosdevname-0.7.3.orig/src/dmidecode/dmidecode.c
+++ biosdevname-0.7.3/src/dmidecode/dmidecode.c
@@ -153,7 +153,7 @@ void smbios_setslot(const struct libbios
}
/* Found a PDEV, now is it a bridge? */
- if (pdev->sbus != -1) {
+ if (pdev->sbus != -1 && pdev->sbus > bus) {
smbios_setslot(state, domain, pdev->sbus, -1, -1, type, slot, index, label);
}
}