Compare commits

...

No commits in common. "c9" and "c8" have entirely different histories.
c9 ... c8

3 changed files with 52 additions and 55 deletions

View File

@ -1 +1 @@
43ce604caee3985a749690d2b43d0a2140b75d51 SOURCES/lsscsi-0.32.tgz 2660fb6e16d2128869e89cd353d37d45ba8cd2f9 SOURCES/lsscsi-0.32.tgz

View File

@ -0,0 +1,34 @@
From db8d419ba39e4547de602ef1ff58cd97d5e1102d Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Wed, 11 Nov 2020 15:39:16 +0100
Subject: [PATCH] fix uninitialized variable
Error: UNINIT (CWE-457): [#def1]
lsscsi-032r164/src/lsscsi.c:3341: var_decl: Declaring variable "type" without initializer.
lsscsi-032r164/src/lsscsi.c:3586: uninit_use_in_call: Using uninitialized value "type" when calling "is_direct_access_dev".
3584| my_strcopy(blkdir, buff, sizeof(blkdir));
3585| value[0] = 0;
3586|-> if (! (is_direct_access_dev(type) &&
3587| block_scan(blkdir) &&
3588| if_directory_chdir(blkdir, ".") &&
---
src/lsscsi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lsscsi.c b/src/lsscsi.c
index 6544153..8a30299 100644
--- a/src/lsscsi.c
+++ b/src/lsscsi.c
@@ -3338,7 +3338,8 @@ one_sdev_entry(const char * dir_name, const char * devname,
const struct lsscsi_opts * op)
{
bool get_wwn = false;
- int type, n, vlen;
+ int type = 0;
+ int n, vlen;
int devname_len = 13;
char buff[LMAX_DEVPATH];
char extra[LMAX_DEVPATH];
--
2.26.2

View File

@ -1,15 +1,15 @@
Summary: List SCSI devices (or hosts) and associated information Summary: List SCSI devices (or hosts) and associated information
Name: lsscsi Name: lsscsi
Version: 0.32 Version: 0.32
Release: 6%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System
# official git repository: https://github.com/doug-gilbert/lsscsi # official git repository: https://github.com/doug-gilbert/lsscsi
Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz
URL: http://sg.danny.cz/scsi/lsscsi.html URL: http://sg.danny.cz/scsi/lsscsi.html
BuildRequires: gcc Patch0: lsscsi-0.32-fix-uninitialized-variable.patch
BuildRequires: make
# https://bugzilla.redhat.com/show_bug.cgi?id=1981038 # https://bugzilla.redhat.com/show_bug.cgi?id=1981038
Patch0: lsscsi-0.33-wwn-trunc.patch Patch1: lsscsi-0.33-wwn-trunc.patch
%description %description
Uses information provided by the sysfs pseudo file system in Linux kernel Uses information provided by the sysfs pseudo file system in Linux kernel
@ -23,15 +23,14 @@ Author:
%prep %prep
%autosetup -p 1 -n %{name}-0.32 %autosetup -p 1 -n %{name}-032r164
%build %build
%configure %configure
%make_build make %{?_smp_mflags}
%install %install
%make_install make DESTDIR=%{buildroot} install
%files %files
@ -41,56 +40,20 @@ Author:
%changelog %changelog
* Tue Aug 17 2021 Tomas Bzatek <tbzatek@redhat.com> - 0.32-6 * Mon Aug 16 2021 Tomas Bzatek <tbzatek@redhat.com> - 0.32-3
- Fix the gating tests
* Mon Aug 16 2021 Tomas Bzatek <tbzatek@redhat.com> - 0.32-5
- Rebase to proper upstream 0.32 release (r167)
- Fix WWN ID truncation (#1981038) - Fix WWN ID truncation (#1981038)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.32-4 * Wed Nov 11 2020 Tomas Bzatek <tbzatek@redhat.com> - 0.32-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Fix an unitialized variable (Covscan)
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.32-3 * Tue Nov 10 2020 Tomas Bzatek <tbzatek@redhat.com> - 0.32-1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Upgrade to 0.32 upstream snapshot (#1855766)
- Fix NVMe device parsing (#1687841, #1845977)
- Fix WWN string reporting (#1846559)
- Implement SCSI identifier sort priority (#1846566)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-2 * Fri Aug 10 2018 Gris Ge <fge@redhat.com> 0.30-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Upgrade to 0.30 release.
* Thu Nov 12 2020 Tomas Bzatek <tbzatek@redhat.com> - 0.32-1
- Update to 0.32 upstream snapshot
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.31-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 0.31-2
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Fri Feb 21 2020 Dan Horák <dan[at]danny.cz> - 0.31-1
- update to 0.31 (#1758436)
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 24 2018 Dan Horák <dan[at]danny.cz> - 0.30-1
- update to 0.30
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.28-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Apr 16 2018 Dan Horák <dan[at]danny.cz> - 0.28-8
- fix FTBFS
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.28-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.28-6 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.28-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild