From e69b291d5a88078e3e4f20f7d0f901669f393646 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 09 2021 10:05:59 +0000 Subject: import hdparm-9.54-4.el8 --- diff --git a/SOURCES/hdparm-9.62-dco_max_sector_calculation.patch b/SOURCES/hdparm-9.62-dco_max_sector_calculation.patch new file mode 100644 index 0000000..ce8ef46 --- /dev/null +++ b/SOURCES/hdparm-9.62-dco_max_sector_calculation.patch @@ -0,0 +1,62 @@ +diff -ruN hdparm-9.54/hdparm.c hdparm-9.54/hdparm.c +--- hdparm-9.54/hdparm.c 2021-04-26 15:05:54.000000000 +0100 ++++ hdparm-9.54/hdparm.c 2021-05-10 15:58:14.000000000 +0100 +@@ -1352,8 +1352,8 @@ + if (verbose) + printf("GET_NATIVE_MAX_ADDRESS_EXT response: hob={%02x %02x %02x} lob={%02x %02x %02x}\n", + r.hob.lbah, r.hob.lbam, r.hob.lbal, r.lob.lbah, r.lob.lbam, r.lob.lbal); +- max = (((__u64)((r.hob.lbah << 16) | (r.hob.lbam << 8) | r.hob.lbal) << 24) +- | ((r.lob.lbah << 16) | (r.lob.lbam << 8) | r.lob.lbal)) + 1; ++ max = (((__u64)((r.hob.lbah << 16) | ((__u64)(r.hob.lbam << 8) | r.hob.lbal)) << 24) ++ | (__u64)((r.lob.lbah << 16) | (r.lob.lbam << 8) | r.lob.lbal)) + 1; + } + } else { // ACS2 or below, or optional AMAX not present + if (SUPPORTS_48BIT_ADDR(id)) { +@@ -1371,7 +1371,7 @@ + printf("READ_NATIVE_MAX_ADDRESS_EXT response: hob={%02x %02x %02x} lob={%02x %02x %02x}\n", + r.hob.lbah, r.hob.lbam, r.hob.lbal, r.lob.lbah, r.lob.lbam, r.lob.lbal); + max = (((__u64)((r.hob.lbah << 16) | (r.hob.lbam << 8) | r.hob.lbal) << 24) +- | ((r.lob.lbah << 16) | (r.lob.lbam << 8) | r.lob.lbal)) + 1; ++ | ((__u64)(r.lob.lbah << 16) | (r.lob.lbam << 8) | r.lob.lbal)) + 1; + } + } else { + /* DEVICE (3:0) / LBA (27:24) "remap" does NOT apply in ATA Status Return */ +@@ -1556,7 +1556,7 @@ + for (i = 0; i < nranges; ++i) { + nsectors += sr->nsectors; + range = sr->nsectors; +- range = (range << 48) | sr->lba; ++ range = (__u64)(range << 48) | sr->lba; + data[i] = __cpu_to_le64(range); + ++sr; + } +@@ -1742,7 +1742,7 @@ + err = errno; + fprintf(stderr, "stdin: error at lba:count pair #%d: %s\n", (total_ranges + 1), strerror(err)); + } else { +- range = (nsect << 48) | lba; ++ range = (__u64)(nsect << 48) | lba; + nsectors += nsect; + data[nranges++] = __cpu_to_le64(range); + if (nranges == max_ranges) { +@@ -2807,7 +2807,7 @@ + __u16 *dco = get_dco_identify_data(fd, 1); + if (dco) { + __u64 dco_max = dco[5]; +- dco_max = ((((__u64)dco[5]) << 32) | (dco[4] << 16) | dco[3]) + 1; ++ dco_max = ((((__u64)dco[5]) << 32) | ((__u64)dco[4] << 16) | (__u64)dco[3]) + 1; + printf("(%llu?)", dco_max); + } + printf(", HPA setting seems invalid"); +diff -ruN hdparm-9.61/identify.c hdparm-9.62/identify.c +--- hdparm-9.43/identify.c 2021-04-26 14:47:24.000000000 +0100 ++++ hdparm-9.43/identify.c 2021-05-10 15:51:23.000000000 +0100 +@@ -1531,7 +1531,7 @@ + else if (dco[2] & (1<<0)) printf(" udma0"); + putchar('\n'); + +- lba = ((((__u64)dco[5]) << 32) | (dco[4] << 16) | dco[3]) + 1; ++ lba = ((((__u64)dco[5]) << 32) | ((__u64)dco[4] << 16) | (__u64)dco[3]) + 1; + printf("\tReal max sectors: %llu\n", lba); + + printf("\tATA command/feature sets:"); diff --git a/SPECS/hdparm.spec b/SPECS/hdparm.spec index 0175559..7caa759 100644 --- a/SPECS/hdparm.spec +++ b/SPECS/hdparm.spec @@ -1,7 +1,7 @@ Summary: A utility for displaying and/or setting hard disk parameters Name: hdparm Version: 9.54 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD URL: http://sourceforge.net/projects/%{name}/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Patch2: %{name}-9.43-get_geom.patch Patch3: %{name}-9.54-sysmacros.patch Patch4: %{name}-9.54-resourceleak-fixes.patch Patch5: %{name}-9.54-resourceleak-fixes-2.patch +Patch6: %{name}-9.62-dco_max_sector_calculation.patch %description Hdparm is a useful system utility for setting (E)IDE hard drive @@ -38,6 +39,9 @@ install -c -m 644 hdparm.8 $RPM_BUILD_ROOT/%{_mandir}/man8 %{_mandir}/man8/hdparm.8* %changelog +* Wed May 12 2021 Michal Grzedzicki - 9.54-4 +- backport fix for --dco-identify real max sectors calculation from upstream version 9.62 (#1959918) + * Fri Nov 06 2020 Tomas Bzatek - 9.54-3 - fix invalid pointer free (#1833092)