56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
|
From 5c30864146412fcdfdcfddcdd94c5c449d9ddbed Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nigel Croxon <ncroxon@redhat.com>
|
||
|
|
Date: Wed, 22 May 2024 16:53:22 -0400
|
||
|
|
Subject: [PATCH 073/201] mdadm: super-intel fix bad shift
|
||
|
|
|
||
|
|
In the expression "1 << i", left shifting by more than 31 bits has undefined behavior.
|
||
|
|
The shift amount, "i", is as much as 63. The operand has type "int" (32 bits) and will
|
||
|
|
be shifted as an "int". The fix is to change to a 64 bit int.
|
||
|
|
|
||
|
|
Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
|
||
|
|
---
|
||
|
|
super-intel.c | 11 ++++++-----
|
||
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/super-intel.c b/super-intel.c
|
||
|
|
index d1b737c7..0287a618 100644
|
||
|
|
--- a/super-intel.c
|
||
|
|
+++ b/super-intel.c
|
||
|
|
@@ -2343,7 +2343,8 @@ void print_encryption_information(int disk_fd, enum sys_dev_type hba_type)
|
||
|
|
get_encryption_status_string(information.status));
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int ahci_enumerate_ports(struct sys_dev *hba, int port_count, int host_base, int verbose)
|
||
|
|
+static int ahci_enumerate_ports(struct sys_dev *hba, unsigned long port_count, int host_base,
|
||
|
|
+ int verbose)
|
||
|
|
{
|
||
|
|
/* dump an unsorted list of devices attached to AHCI Intel storage
|
||
|
|
* controller, as well as non-connected ports
|
||
|
|
@@ -2357,7 +2358,7 @@ static int ahci_enumerate_ports(struct sys_dev *hba, int port_count, int host_ba
|
||
|
|
|
||
|
|
if (port_count > (int)sizeof(port_mask) * 8) {
|
||
|
|
if (verbose > 0)
|
||
|
|
- pr_err("port_count %d out of range\n", port_count);
|
||
|
|
+ pr_err("port_count %ld out of range\n", port_count);
|
||
|
|
return 2;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2499,11 +2500,11 @@ static int ahci_enumerate_ports(struct sys_dev *hba, int port_count, int host_ba
|
||
|
|
if (dir)
|
||
|
|
closedir(dir);
|
||
|
|
if (err == 0) {
|
||
|
|
- int i;
|
||
|
|
+ unsigned long i;
|
||
|
|
|
||
|
|
for (i = 0; i < port_count; i++)
|
||
|
|
- if (port_mask & (1 << i))
|
||
|
|
- printf(" Port%d : - no device attached -\n", i);
|
||
|
|
+ if (port_mask & (1L << i))
|
||
|
|
+ printf(" Port%ld : - no device attached -\n", i);
|
||
|
|
}
|
||
|
|
|
||
|
|
return err;
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|