import iprutils-2.4.19-13.el10

3 months ago · e21bfc6d35
commit e21bfc6d35
4 changed files with 842 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,2 @@
+SOURCES/iprdbg.8.gz
+SOURCES/iprutils-2.4.19.tar.gz
--- a/.iprutils.metadata
+++ b/.iprutils.metadata
@ -0,0 +1,2 @@
+ba7fff20477af3cb00dcc323690ca108454a2302 SOURCES/iprdbg.8.gz
+df06b14873f4a6f70099347e4f0c003d33d72782 SOURCES/iprutils-2.4.19.tar.gz
--- a/SOURCES/iprutils-2.4.19-covscan.patch
+++ b/SOURCES/iprutils-2.4.19-covscan.patch
@ -0,0 +1,449 @@
+diff -up iprutils-rel-2-4-19/iprconfig.c.me iprutils-rel-2-4-19/iprconfig.c
+--- iprutils-rel-2-4-19/iprconfig.c.me	2024-06-17 12:10:54.493119641 +0200
+++ iprutils-rel-2-4-19/iprconfig.c	2024-06-18 11:20:17.885495296 +0200
+@@ -2483,7 +2483,7 @@ static char *disk_details(char *body, st
+ 	char vendor_id[IPR_VENDOR_ID_LEN+1];
+ 	char serial_num[IPR_SERIAL_NUM_LEN+1];
+ 	char buffer[100];
+-	int len, scsi_channel, scsi_id, scsi_lun;
+	int len = 0, scsi_channel = 0, scsi_id = 0, scsi_lun = 0;
+ 
+ 	device_record = (struct ipr_dev_record *)dev->dev_rcd;
+ 
+@@ -2633,7 +2633,7 @@ int get_ses_phy_loc(struct ipr_dev *dev)
+ 	int rc, i, ret = 1;
+ 	struct ses_inquiry_page0  ses_page0_inq;
+ 	struct ses_serial_num_vpd ses_vpd_inq;
+-	struct esm_serial_num_vpd esm_vpd_inq;
+	struct esm_serial_num_vpd esm_vpd_inq = {0};
+ 	char buffer[100];
+ 
+ 	memset(&ses_vpd_inq, 0, sizeof(ses_vpd_inq));
+@@ -2649,18 +2649,18 @@ int get_ses_phy_loc(struct ipr_dev *dev)
+ 
+ 	if (ret == 0 ) {
+ 		dev->physical_location[0] = '\0';
+-		strncat(dev->physical_location, "U", strlen("U"));
+		strcat(dev->physical_location, "U");
+ 		ipr_strncpy_0(buffer, (char *)ses_vpd_inq.feature_code,
+ 				sizeof(ses_vpd_inq.feature_code));
+-		strncat(dev->physical_location, buffer, strlen(buffer));
+		strncat(dev->physical_location, buffer, sizeof(dev->physical_location) - strlen(dev->physical_location) -1);
+ 		ipr_strncpy_0(buffer, (char *)ses_vpd_inq.count,
+ 				sizeof(ses_vpd_inq.count));
+-		strncat(dev->physical_location, ".", strlen("."));
+-		strncat(dev->physical_location, buffer, strlen(buffer));
+		strcat(dev->physical_location, ".");
+		strncat(dev->physical_location, buffer, sizeof(dev->physical_location) - strlen(dev->physical_location) -1);
+ 		ipr_strncpy_0(buffer, (char *)ses_vpd_inq.ses_serial_num,
+ 				sizeof(ses_vpd_inq.ses_serial_num));
+-		strncat(dev->physical_location, ".", strlen("."));
+-		strncat(dev->physical_location, buffer, strlen(buffer));
+		strcat(dev->physical_location, ".");
+		strncat(dev->physical_location, buffer, sizeof(dev->physical_location) - strlen(dev->physical_location) -1);
+ 
+ 	}
+ 
+@@ -2676,8 +2676,8 @@ int get_ses_phy_loc(struct ipr_dev *dev)
+ 			ipr_strncpy_0((char *)&dev->serial_number, (char *)&esm_vpd_inq.esm_serial_num[0], sizeof(esm_vpd_inq.esm_serial_num));
+ 			ipr_strncpy_0(buffer, (char *)esm_vpd_inq.frb_label,
+ 					sizeof(esm_vpd_inq.frb_label));
+-			strncat(dev->physical_location, "-", strlen("-"));
+-			strncat(dev->physical_location, buffer, strlen(buffer));
+			strcat(dev->physical_location, "-");
+			strncat(dev->physical_location, buffer, sizeof(dev->physical_location) - strlen(dev->physical_location) -1);
+ 			return 0;
+ 		}
+ 	}
+@@ -3313,7 +3313,7 @@ static int raid_stop_complete()
+  **/
+ int do_confirm_raid_stop(i_container *i_con)
+ {
+-	struct ipr_dev *vset;
+	struct ipr_dev *vset = NULL;
+ 	struct array_cmd_data *cur_raid_cmd;
+ 	struct ipr_ioa *ioa;
+ 	int rc;
+@@ -3715,7 +3715,7 @@ int configure_raid_parameters(i_containe
+ 	int ch, start_row;
+ 	int cur_field_index;
+ 	int selected_count = 0, ssd_num = 0, hdd_num = 0;
+-	int stripe_sz, stripe_sz_mask, stripe_sz_list[16];
+	int stripe_sz, stripe_sz_mask, stripe_sz_list[16] = {0};
+ 	struct prot_level *prot_level_list;
+ 	int *userptr = NULL;
+ 	int *retptr;
+@@ -3979,7 +3979,7 @@ int configure_raid_parameters(i_containe
+ 							sprintf(stripe_menu_str[index].line,"%d k",stripe_sz_mask);
+ 
+ 						if (stripe_sz_mask == ntohs(cap_entry->recommended_stripe_size)) {
+-							sprintf(buffer,_("%s - recommend"),stripe_menu_str[index].line);
+							snprintf(buffer, sizeof(buffer), _("%s - recommend"),stripe_menu_str[index].line);
+ 							raid_item[index] = new_item(buffer, "");
+ 						} else {
+ 							raid_item[index] = new_item(stripe_menu_str[index].line, "");
+@@ -7486,7 +7486,7 @@ int remove_or_add_back_device_64bit(stru
+ 	int res_path_len, dev_slot;
+ 	struct ipr_dev *sec_dev, *tmp_dev;
+ 	char new_sysfs_res_path[IPR_MAX_RES_PATH_LEN];
+-	int rc;
+	int rc = 0;
+ 
+ 	res_path_len  = strlen(dev->res_path_name);
+ 	dev_slot = strtoul(dev->res_path_name + (res_path_len - 2), NULL, 16);
+@@ -7558,7 +7558,7 @@ int process_conc_maint(i_container *i_co
+ 	int toggle=0;
+ 	s_node *n_screen;
+ 	struct screen_output *s_out;
+-	struct ipr_res_addr res_addr;
+	struct ipr_res_addr res_addr = {0};
+ 	struct ipr_res_path res_path[2];
+ 	int max_y, max_x;
+ 
+@@ -7905,7 +7905,7 @@ static struct ipr_dev *alloc_empty_slot(
+ 	dev->ses[0] = ses;
+ 	dev->ioa = ioa;
+ 	dev->physical_location[0] = '\0';
+-	strncat(dev->physical_location, phy_loc, strlen(phy_loc));
+   strncat(dev->physical_location, phy_loc, sizeof(dev->physical_location) - strlen(dev->physical_location) -1);
+ 	get_res_addrs(dev);
+ 	return dev;
+ }
+@@ -7948,7 +7948,7 @@ static struct ipr_dev *alloc_empty_slot_
+ 	dev->ses[0] = ses;
+ 	dev->ioa = ioa;
+ 	dev->physical_location[0] = '\0';
+-	strncat(dev->physical_location, phy_loc, strlen(phy_loc));
+	strncat(dev->physical_location, phy_loc, sizeof(dev->physical_location) - strlen(dev->physical_location) -1);
+ 	get_res_path(dev);
+ 	return dev;
+ }
+@@ -8020,7 +8020,7 @@ static struct ipr_dev *get_dev_for_slot(
+ 			}
+ 			dev->physical_location[0] = '\0';
+ 			if (strlen(phy_loc))
+-				strncat(dev->physical_location, phy_loc, strlen(phy_loc));
+				strncat(dev->physical_location, phy_loc, sizeof(dev->physical_location) - strlen(dev->physical_location) -1);
+ 			return dev;
+ 		}
+ 	}
+@@ -8068,7 +8068,7 @@ static struct ipr_dev *get_dev_for_slot_
+ 				}
+ 			dev->physical_location[0] = '\0';
+ 			if (strlen(phy_loc))
+-				strncat(dev->physical_location, phy_loc, strlen(phy_loc));
+				strncat(dev->physical_location, phy_loc, sizeof(dev->physical_location) - strlen(dev->physical_location) -1);
+ 			return dev;
+ 
+ 			}
+@@ -8282,7 +8282,7 @@ static int get_conc_devs(struct ipr_dev
+ 	int ses_bus, scsi_id_found, is_spi, is_vses;
+ 	struct ipr_ses_config_pg ses_cfg;
+ 	struct drive_elem_desc_pg drive_data;
+-	char phy_loc[PHYSICAL_LOCATION_LENGTH + 1];
+	char phy_loc[PHYSICAL_LOCATION_LENGTH + 1] = {0};
+ 	int times, index;
+ 
+ 	for_each_primary_ioa(ioa) {
+@@ -11447,7 +11447,7 @@ int change_ioa_config(i_container * i_co
+ 	 * number of options showed at screen. It should be more generic...
+ 	*/
+ 	struct ioa_config_attr *config_attr = NULL;
+-	struct ipr_ioa_attr ioa_attr;
+	struct ipr_ioa_attr ioa_attr = {0};
+ 	int header_lines = 0, index = 0;
+ 	char *body = NULL;
+ 	struct screen_output *s_out;
+@@ -12418,8 +12418,7 @@ int ibm_storage_log(i_container *i_con)
+ 			 (*dirent)->d_name);
+ 		logsource_fp = gzopen(logfile, "r");
+ 		if (logsource_fp == NULL) {
+-			syslog(LOG_ERR, "Could not open %s: %m\n", line);
+-			close(log_fd);
+			syslog(LOG_ERR, "Could not open %s: %m\n", logfile);
+ 			continue; /* proceed to next log file */
+ 		}
+ 
+@@ -12524,8 +12523,7 @@ int kernel_log(i_container *i_con)
+ 			 (*dirent)->d_name);
+ 		logsource_fp = gzopen(logfile, "r");
+ 		if (logsource_fp == NULL) {
+-			syslog(LOG_ERR, "Could not open %s: %m\n", line);
+-			close(log_fd);
+			syslog(LOG_ERR, "Could not open %s: %m\n", logfile);
+ 			continue; /* proceed to next log file */
+ 		}
+ 
+@@ -12602,8 +12600,7 @@ int iprconfig_log(i_container *i_con)
+ 			 (*dirent)->d_name);
+ 		logsource_fp = gzopen(logfile, "r");
+ 		if (logsource_fp == NULL) {
+-			syslog(LOG_ERR, "Could not open %s: %m\n", line);
+-			close(log_fd);
+			syslog(LOG_ERR, "Could not open %s: %m\n", logfile);
+ 			continue; /* proceed to next log file */
+ 		}
+ 
+@@ -12855,7 +12852,7 @@ int ibm_boot_log(i_container *i_con)
+ 	snprintf(logfile, sizeof(logfile), "%s/boot.msg", log_root_dir);
+ 	logsource_fp = fopen(logfile, "r");
+ 	if (!logsource_fp) {
+-		syslog(LOG_ERR, "Could not open %s: %m\n", line);
+		syslog(LOG_ERR, "Could not open %s: %m\n", logfile);
+ 		free(tmp_log);
+ 		close(log_fd);
+ 		return RC_75_Failed_Read_Err_Log;
+@@ -12917,7 +12914,7 @@ static void get_status(struct ipr_dev *d
+ 	int blk_size = 0;
+ 	struct ipr_mode_pages mode_pages;
+ 	struct ipr_block_desc *block_desc;
+-	struct sense_data_t sense_data;
+	struct sense_data_t sense_data = {0};
+ 	struct ipr_cmd_status cmd_status;
+ 	struct ipr_cmd_status_record *status_record;
+ 	int percent_cmplt = 0;
+@@ -13261,7 +13258,7 @@ static char *print_phy64(struct ipr_fabr
+ 	ipr_format_res_path_wo_hyphen(cfg->res_path, buffer, IPR_MAX_RES_PATH_LEN);
+ 	ff_len = res_path_len - strlen(buffer);
+ 	for ( i = 0; i < ff_len;  i++)
+-		strncat(buffer, "F", strlen("F"));
+		strcat(buffer, "F");
+ 
+ 	len += sprintf(body + len, "%s", buffer);
+ 
+@@ -13419,8 +13416,8 @@ char *__print_device(struct ipr_dev *dev
+ 	char res_path_name[IPR_MAX_RES_PATH_LEN];
+ 	int tab_stop = 0;
+ 	int loc_len = 0;
+-	char vendor_id[IPR_VENDOR_ID_LEN + 1];
+-	char product_id[IPR_PROD_ID_LEN + 1];
+	char vendor_id[IPR_VENDOR_ID_LEN + 1] = {0};
+	char product_id[IPR_PROD_ID_LEN + 1] = {0};
+ 	struct ipr_ioa *ioa = dev->ioa, *ioa_phy_loc;
+ 	bool is4k = false, isri = false;
+ 
+@@ -14009,7 +14006,7 @@ static void curses_init()
+  **/
+ static int format_devices(char **args, int num_args, int fmt_flag)
+ {
+-	int i, rc, blksz;
+	int i, rc, blksz = 0;
+ 	struct ipr_dev *dev;
+ 
+ 	for (i = 0; i < num_args; i++) {
+@@ -17779,7 +17776,7 @@ static int get_drive_phy_loc(struct ipr_
+ 	struct ipr_ses_config_pg ses_cfg;
+ 	int ses_bus, scsi_id_found, is_spi, is_vses;
+ 	struct drive_elem_desc_pg drive_data;
+-	char phy_loc[PHYSICAL_LOCATION_LENGTH + 1];
+	char phy_loc[PHYSICAL_LOCATION_LENGTH + 1] = {0};
+ 	int times, index;
+ 
+ 	is_spi = ioa_is_spi(ioa);
+@@ -18222,7 +18219,7 @@ static int set_ioa_caching(char **args,
+ static int set_array_rebuild_verify(char **args, int num_args)
+ {
+ 	int rc;
+-	struct ipr_ioa_attr attr;
+	struct ipr_ioa_attr attr = {0};
+ 	struct ipr_ioa *ioa;
+ 	struct ipr_dev *dev;
+ 	int disable_rebuild_verify;
+@@ -18318,7 +18315,7 @@ static int set_array_rebuild_rate(char**
+ 	int err_rebuild_rate = 0;
+ 	int rebuild_rate = 0;
+ 	int rc;
+-	struct ipr_ioa_attr attr;
+	struct ipr_ioa_attr attr = {0};
+ 	struct ipr_ioa *ioa;
+ 	struct ipr_dev *dev;
+ 
+@@ -18382,7 +18379,7 @@ static int set_array_rebuild_rate(char**
+  **/
+ static int query_array_rebuild_rate(char**args, int num_args)
+ {
+-	struct ipr_ioa_attr attr;
+	struct ipr_ioa_attr attr = {0};
+ 	struct ipr_ioa *ioa;
+ 	struct ipr_dev *dev;
+ 	int rebuild_rate = 0;
+diff -up iprutils-rel-2-4-19/iprconfig.h.me iprutils-rel-2-4-19/iprconfig.h
+diff -up iprutils-rel-2-4-19/iprdump.c.me iprutils-rel-2-4-19/iprdump.c
+--- iprutils-rel-2-4-19/iprdump.c.me	2024-06-17 17:12:49.846400485 +0200
+++ iprutils-rel-2-4-19/iprdump.c	2024-06-18 00:41:47.907738323 +0200
+@@ -23,6 +23,7 @@
+ #define MAX_DUMP_FILES 4
+ #define TOOL_NAME "iprdump"
+ #define DUMP_PREFIX TOOL_NAME"."
+#define MAX_PATH_LENGTH 1024
+ 
+ char *tool_name = TOOL_NAME;
+ 
+@@ -156,7 +157,7 @@ static int dump_sort(const struct dirent
+ static void cleanup_old_dumps()
+ {
+ 	struct dirent **dirent;
+-	char fname[100];
+	char fname[MAX_PATH_LENGTH];
+ 	int rc, i;
+ 
+ 	rc = scandir(usr_dir, &dirent, select_dump_file, dump_sort);
+@@ -226,7 +227,7 @@ static void write_dump(struct ipr_ioa *i
+ 	if (get_dump_fname(dump_file))
+ 		return;
+ 
+-	sprintf(dump_path, "%s%s", usr_dir, dump_file);
+	snprintf(dump_path, sizeof(dump_path), "%s%s", usr_dir, dump_file);
+ 	f_dump = creat(dump_path, S_IRUSR);
+ 	if (f_dump < 0) {
+ 		syslog(LOG_ERR, "Cannot open %s. %m\n", dump_path);
+@@ -347,7 +348,7 @@ int main(int argc, char *argv[])
+ 		if (strcmp(argv[i], "-d") == 0) {
+ 			strcpy(usr_dir,argv[++i]);
+ 			len = strlen(usr_dir);
+-			if (len < sizeof(usr_dir) && usr_dir[len] != '/') {
+			if (len < sizeof(usr_dir) - 2 && usr_dir[len] != '/') {
+ 				usr_dir[len + 1] = '/';
+ 				usr_dir[len + 2] = '\0';
+ 			}
+diff -up iprutils-rel-2-4-19/iprlib.c.me iprutils-rel-2-4-19/iprlib.c
+--- iprutils-rel-2-4-19/iprlib.c.me	2024-06-17 12:22:56.983740856 +0200
+++ iprutils-rel-2-4-19/iprlib.c	2024-06-18 10:09:20.716132953 +0200
+@@ -2063,8 +2063,9 @@ static void ipr_get_pci_slots()
+ 				if (strcmp(pci_slot[i].pci_device, ioa->pci_address) &&
+ 				    strcmp(pci_slot[i].slot_name, ioa->pci_address))
+ 					continue;
+-				strcpy(ioa->physical_location,
+-				       pci_slot[i].physical_name);
+				strncpy(ioa->physical_location,
+				       pci_slot[i].physical_name, sizeof(ioa->physical_location) - 1);
+				ioa->physical_location[sizeof(ioa->physical_location) - 1] = '\0';
+ 				break;
+ 			}
+ 		}
+@@ -2101,7 +2102,7 @@ void load_system_p_oper_mode()
+  **/
+ static int __tool_init(int save_state)
+ {
+-	int temp, fw_type;
+	int temp, fw_type = 0;
+ 	struct ipr_ioa *ipr_ioa;
+ 	DIR *dirfd, *host_dirfd;
+ 	struct dirent *dent, *host_dent;
+@@ -2132,13 +2133,15 @@ static int __tool_init(int save_state)
+ 		memset(ipr_ioa,0,sizeof(struct ipr_ioa));
+ 
+ 		/* PCI address */
+-		strcpy(ipr_ioa->pci_address, dent->d_name);
+		strncpy(ipr_ioa->pci_address, dent->d_name, sizeof(ipr_ioa->pci_address) - 1);
+		ipr_ioa->pci_address[sizeof(ipr_ioa->pci_address) -1] = '\0';
+ 		ipr_ioa->host_num = -1;
+ 		sprintf(devpath, "/sys/bus/pci/drivers/ipr/%s",
+ 			dent->d_name);
+ 		host_dirfd = opendir(devpath);
+ 		if (!host_dirfd) {
+ 			syslog_dbg("Failed to open scsi_host class.\n");
+			closedir(dirfd);
+ 			return -EAGAIN;
+ 		}
+ 		while ((host_dent = readdir(host_dirfd)) != NULL) {
+@@ -2152,7 +2155,8 @@ static int __tool_init(int save_state)
+ 				   &ipr_ioa->host_num) != 1)
+ 				continue;
+ 
+-			strcpy(ipr_ioa->host_name, host_dent->d_name);
+			strncpy(ipr_ioa->host_name, host_dent->d_name, sizeof(ipr_ioa->host_name) - 1);
+			ipr_ioa->host_name[sizeof(ipr_ioa->host_name) - 1] = '\0';
+ 			get_pci_attrs(ipr_ioa, devpath);
+ 
+ 			sprintf(scsipath, "%s/%s/scsi_host/%s", devpath,
+@@ -2188,6 +2192,7 @@ static int __tool_init(int save_state)
+ 		len = sysfs_read_attr(devpath, "model", buff, 16);
+ 		if (len < 0 || (sscanf(buff, "%4X", &temp) != 1)) {
+ 			syslog_dbg("Cannot read SCSI device model.\n");
+			closedir(dirfd);
+ 			return -EAGAIN;
+ 		}
+ 		ipr_ioa->ccin = temp;
+@@ -5747,7 +5752,7 @@ int ipr_set_active_active_mode(struct ip
+  **/
+ int set_active_active_mode(struct ipr_ioa *ioa, int mode)
+ {
+-	struct ipr_ioa_attr attr;
+	struct ipr_ioa_attr attr = {0};
+ 	int rc;
+ 
+ 	/* Get the current ioa attributes. */
+@@ -5860,7 +5865,7 @@ int get_scsi_dev_data(struct scsi_dev_da
+ 		len = sysfs_read_attr(devpath, "resource_path", buff, 256);
+ 		if (len > 0)
+ 			ipr_strncpy_0n(scsi_dev_data->res_path,
+-				       buff, IPR_MAX_RES_PATH_LEN);
+				       buff, IPR_MAX_RES_PATH_LEN-1);
+  
+ 		len = sysfs_read_attr(devpath, "device_id", buff, 256);
+ 		if (len > 0)
+@@ -6255,15 +6260,19 @@ static void get_prot_levels(struct ipr_i
+ 	for_each_array(ioa, array) {
+ 		prot_level_str = get_prot_level_str(ioa->supported_arrays,
+ 						    array->raid_level);
+-		strncpy(array->prot_level_str, prot_level_str, 8);
+		strncpy(array->prot_level_str, prot_level_str, sizeof(array->prot_level_str) - 1);
+		array->prot_level_str[sizeof(array->prot_level_str) - 1] = '\0';
+ 	}
+ 
+ 	for_each_vset(ioa, vset) {
+ 		prot_level_str = get_prot_level_str(ioa->supported_arrays,
+ 						    vset->raid_level);
+-		strncpy(vset->prot_level_str, prot_level_str, 8);
+-		for_each_dev_in_vset(vset, dev)
+-			strncpy(dev->prot_level_str, prot_level_str, 8);
+		strncpy(vset->prot_level_str, prot_level_str, sizeof(vset->prot_level_str) - 1);
+		vset->prot_level_str[sizeof(vset->prot_level_str) - 1] = '\0';
+		for_each_dev_in_vset(vset, dev) {
+			strncpy(dev->prot_level_str, prot_level_str, sizeof(dev->prot_level_str) - 1);
+			dev->prot_level_str[sizeof(dev->prot_level_str) - 1] = '\0';
+		}
+ 	}
+ }
+ 
+@@ -7038,6 +7047,7 @@ static void ipr_save_attr(struct ipr_ioa
+ 	temp_fd = fopen(temp_fname, "w");
+ 	if (temp_fd == NULL) {
+ 		syslog(LOG_ERR, "Could not open %s. %m\n", temp_fname);
+		fclose(fd);
+ 		return;
+ 	}
+ 
+@@ -9175,6 +9185,8 @@ int ipr_update_ioa_fw(struct ipr_ioa *io
+ 		dir = opendir(hotplug_dir);
+ 		if (!dir)
+ 			mkdir(hotplug_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+		else
+			closedir(dir);
+ 
+ 		dir = opendir(hotplug_dir);
+ 		if (!dir) {
+@@ -9356,7 +9368,12 @@ int ipr_ses_get_time(struct ipr_dev *dev
+ 		return -EIO;
+ 
+ 	*origin = !!get_time.timestamp_origin;
+-	*timestamp = be64toh(*((u64*) get_time.timestamp)) >> 16;
+	*timestamp = ((u64)get_time.timestamp[0] << 40) |
+					 ((u64)get_time.timestamp[1] << 32) |
+					 ((u64)get_time.timestamp[2] << 24) |
+					 ((u64)get_time.timestamp[3] << 16) |
+					 ((u64)get_time.timestamp[4] << 8)  |
+					 (u64)get_time.timestamp[5];
+ 	return 0;
+ }
+ 
+@@ -9776,7 +9793,7 @@ static void init_gpdd_dev(struct ipr_dev
+  */
+ static void init_af_dev(struct ipr_dev *dev)
+ {
+-	struct ipr_disk_attr attr;
+	struct ipr_disk_attr attr = {0};
+ 	int rc;
+ 
+ 	if (ipr_set_dasd_timeouts(dev, 0))
--- a/SPECS/iprutils.spec
+++ b/SPECS/iprutils.spec
@ -0,0 +1,389 @@
+%global gitver rel-2-4-19
+
+Summary: Utilities for the IBM Power Linux RAID adapters
+Name:    iprutils
+Version: 2.4.19
+Release: 13%{?dist}
+License: CPL-1.0
+URL:     https://github.com/bjking1/iprutils
+Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz
+
+# missing man page
+Source1: iprdbg.8.gz
+
+# covscan issues
+Patch10: iprutils-2.4.19-covscan.patch
+
+ExclusiveArch: ppc64le
+
+BuildRequires: libtool
+BuildRequires: ncurses-devel
+BuildRequires: libcap-devel
+BuildRequires: kernel-headers
+BuildRequires: systemd
+BuildRequires: zlib-devel
+BuildRequires: make
+
+
+%description
+Provides a suite of utilities to manage and configure SCSI devices
+supported by the ipr SCSI storage device driver.
+
+
+%prep
+%autosetup -p1 -n %{name}-%{gitver}
+
+autoreconf -vif
+
+
+%build
+%configure --with-systemd --without-initscripts --disable-static --disable-sosreport
+%{make_build}
+
+
+%install
+%{make_install}
+
+# missing man page
+install -p -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/
+
+#install bash completion
+mv %{buildroot}/%{_sysconfdir}/bash_completion.d/{iprconfig-bash-completion.sh,iprconfig}
+
+# Remove temporary files and scripts that will not be packaged.
+rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha
+
+
+%post
+%systemd_post iprinit.service
+%systemd_post iprdump.service
+%systemd_post iprupdate.service
+%systemd_post iprutils.target
+
+%preun
+%systemd_preun iprinit.service
+%systemd_preun iprdump.service
+%systemd_preun iprupdate.service
+%systemd_preun iprutils.target
+
+%files
+%license LICENSE
+%doc README
+%{_sbindir}/*
+%{_sysconfdir}/bash_completion.d/
+%{_mandir}/man*/*
+%{_unitdir}/iprinit.service
+%{_unitdir}/iprdump.service
+%{_unitdir}/iprupdate.service
+%{_unitdir}/iprutils.target
+%{_udevrulesdir}/90-iprutils.rules
+
+
+%changelog
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.4.19-13
+- Rebuilt for MSVSphere 10
+
+* Mon Aug 05 2024 Than Ngo <than@redhat.com> - 2.4.19-13
+- fix license tag
+
+Related: RHEL-43273
+
+* Mon Jul 08 2024 Than Ngo <than@redhat.com> - 2.4.19-12
+- fix covscan issues
+- limit to ppc64le
+- fix runtest
+
+Resolves: RHEL-43273
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.4.19-11
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.19-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.19-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.19-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.19-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.19-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.19-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.19-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.19-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 09 2020 Than Ngo <than@redhat.com> - 2.4.19-1
+- rebase to 2.4.19
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.17.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.17.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Apr 15 2019 Than Ngo <than@redhat.com> - 2.4.17.1-2
+- add tests
+
+* Mon Mar 04 2019 Than Ngo <than@redhat.com> - 2.4.17.1-1
+- update to 2.4.17.1
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.16.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.16.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon May 14 2018 Dan Horák <dan[at]danny.cz> - 2.4.16.1-2
+- use better patch for udev activation
+
+* Fri May 11 2018 Dan Horák <dan[at]danny.cz> - 2.4.16.1-1
+- rebased to 2.4.16.1
+- spec file cleanup
+
+* Thu Mar 15 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.4.15.1-4
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.15.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 23 2018 Merlin Mathesius <mmathesi@redhat.com> - 2.4.15.1-2
+- Not building kernel modules, so use kernel-headers instead of kernel-devel
+
+* Fri Oct 13 2017 Sinny Kumari <sinnykunmari@fedoraproject.org> - 2.4.15.1-1
+- Rebase to 2.4.15.1
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.14.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.14.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Apr 05 2017 Sinny Kumari <sinnykunmari@fedoraproject.org> - 2.4.14.1-1
+- Rebase to 2.4.14.1
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Aug 10 2016 Sinny Kumari <sinnykumari@fedoraproject.org> - 2.4.12.1-1
+- Rebase to 2.4.12.1
+
+* Mon Apr 11 2016 Sinny Kumari <sinnykumari@fedoraproject.org> - 2.4.11.1-1
+- Update to 2.4.11.1
+- Add zlib-devel as BuildRequires
+
+* Sat Feb 27 2016 Jakub Čajka <jcajka@redhat.com> - 2.4.10.1-1
+- rebase to 2.4.10.1
+- Resolves: #1289145 - iprutils-2.4.9 package update in Fedora
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jul 10 2015 Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> - 2.4.8-1
+- Rebase to 2.4.8
+- Move to Autotools
+- Remove unused files
+- Rebase patch 0001 to use autotools
+- Install bash completion
+- Spec file clean up
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Nov 19 2014 Jakub Čajka <jcajka@redhat.com> - 2.4.5-1
+- Rebase to 2.4.5
+
+* Wed Oct 1 2014 Jakub Čajka <jcajka@redhat.com> - 2.4.4-1
+- Rebase to 2.4.4
+- Moved to systemd
+- Spec file clean up
+- Fixed build flags
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.13-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Dec 29 2012 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.13-1
+- update to 2.3.13
+
+* Tue Sep 11 2012 David Aquilina <dwa@redhat.com> 2.3.11-2
+- Prevent the RPM from conflicting with itself (BZ #856330)
+
+* Wed Sep 05 2012 Karsten Hopp <karsten@redhat.com> 2.3.11-1
+- update to 2.3.11
+- enable on all archs as it now supports some adapters on them, too.
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue May 08 2012 Karsten Hopp <karsten@redhat.com> 2.3.10-1
+- update to iprutils-2.3.10
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Dec 22 2011 Jiri Skala <jskala@redhat.com> - 2.3.9-1
+- Update to version 2.3.9
+
+* Wed Aug 24 2011 Jiri Skala <jskala@redhat.com> - 2.3.7-1
+- Update to version 2.3.7
+
+* Fri Aug 05 2011 Jiri Skala <jskala@redhat.com> - 2.3.6-1
+- Update to version 2.3.6
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Feb 09 2011 Jiri Skala <jskala@redhat.com> - 2.3.2-1
+- Update to version 2.3.2
+
+* Mon Apr 12 2010 Roman Rakus <rrakus@redhat.com> - 2.2.20-1
+- Update to version 2.2.20
+
+* Thu Feb 11 2010 Roman Rakus <rrakus@redhat.com> 2.2.18-3
+- added missing man page
+
+* Tue Jan 26 2010 Roman Rakus <rrakus@redhat.com> 2.2.18-2
+- moved files from /sbin to /usr/sbin and made symlinks
+
+* Wed Nov 04 2009 Roman Rakus <rrakus@redhat.com> - 2.2.18-1
+- Version 2.2.18
+
+* Mon Oct 05 2009 Roman Rakus <rrakus@redhat.com> - 2.2.17-2
+- Fixed initscripts (#522464, #522462, #522461)
+
+* Thu Sep 17 2009 Roman Rakus <rrakus@redhat.com> - 2.2.17-1
+- Version 2.2.17
+
+* Mon Aug 17 2009 Roman Rakus <rrakus@redhat.com> - 2.2.16-1
+- Bump to version 2.2.16
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 2 2009 Will Woods <wwoods@redhat.com> - 2.2.13-2
+- Fix iprdump startup - #483340
+- iprutils-swab-moved.patch - fix compilation with 2.6.29 kernels (#483643)
+
+* Fri Nov 21 2008 Roman Rakus <rrakus@redhat.com> - 2.2.13-1
+- New upstream version
+
+* Wed Jul  2 2008 Roman Rakus <rrakus@redhat.com> - 2.2.8-6
+- Fixed ExclusiveArch tag
+
+* Wed Jul  2 2008 Roman Rakus <rrakus@redhat.com> - 2.2.8-5
+- Fixed chkconfig issue - #453165
+
+* Wed Apr  9 2008 Roman Rakus <rrakus@redhat.cz> - 2.2.8-4
+- Rewrited initscripts for satisfying LSB spec
+
+* Fri Feb 08 2008 David Cantrell <dcantrell@redhat.com> - 2.2.8-2
+- Rebuild for gcc-4.3
+
+* Fri Nov 16 2007 David Cantrell <dcantrell@redhat.com> - 2.2.8-1
+- Upgrade to latest upstream release
+
+* Mon Oct  1 2007 Jeremy Katz <katzj@redhat.com> - 2.2.6-3
+- don't require redhat-lsb (#252343)
+
+* Tue Aug 21 2007 David Cantrell <dcantrell@redhat.com> - 2.2.6-2
+- Rebuild
+
+* Thu May 17 2007 Paul Nasrat <pnasrat@redhat.com> - 2.2.6-1
+- Update to latest upstream
+
+* Thu Jul 13 2006 Paul Nasrat <pnasrat@redhat.com> - 2.1.5-1
+- New upstream version
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.1.4-3.1
+- rebuild
+
+* Mon Jul 10 2006 Paul Nasrat <pnasrat@redhat.com> - 2.1.4-3
+- Add redhat-lsb requires
+
+* Mon Jul 10 2006 David Woodhouse <dwmw2@redhat.com> - 2.1.4-2
+- Rebuild against new sysfsutils
+
+* Mon Jun 26 2006 Paul Nasrat <pnasrat@redhat.com> - 2.1.4-1
+- Update to 2.1.4
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.1.1-1.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.1.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Dec 23 2005 Paul Nasrat <pnasrat@redhat.com> - 2.1.1-1
+- Update to 2.1.1
+- Use RPM_OPT_FLAGS
+
+* Tue Aug 02 2005 Paul Nasrat <pnasrat@redhat.com> - 2.0.15.3-1
+- update to 2.0.15.3-1
+
+* Wed May 11 2005 Paul Nasrat <pnasrat@redhat.com> - 2.0.14.2-1
+- update to 2.0.14.2 (#156934)
+
+* Thu Feb 24 2005 Paul Nasrat <pnasrat@redhat.com> - 2.0.13.7-1
+- Update to 2.0.13.7 (#144654)
+- Project moved location to sourceforge
+
+* Mon Jan 03 2005 Paul Nasrat <pnasrat@redhat.com> - 2.0.13.5-1
+- Update to 2.0.13.5 (#143593)
+
+* Wed Dec  8 2004 Jeremy Katz <katzj@redhat.com> - 2.0.13.4-2
+- link dynamically to sysfsutils instead of statically (#142310)
+
+* Wed Dec 08 2004 Paul Nasrat <pnasrat@redhat.com> 2.0.13.4-1
+- update to 2.0.13.4 (#142164)
+
+* Fri Dec  3 2004 Jeremy Katz <katzj@redhat.com> - 2.0.13.3-1
+- update to 2.0.13.3 (#141707)
+
+* Mon Nov 15 2004 Jeremy Katz <katzj@redhat.com> - 2.0.13.2-1
+- update to 2.0.13.2 (#139083)
+  - fix firmware upload for firmware in /lib instead of /usr/lib
+  - fix sysfs race
+
+* Wed Oct  6 2004 Jeremy Katz <katzj@redhat.com> - 2.0.13-1
+- update to 2.0.13 (#128996)
+
+* Tue Aug  3 2004 Jeremy Katz <katzj@redhat.com> - 2.0.12-1
+- update to 2.0.12
+- include a copy of libsysfs to build
+
+* Tue Jun 15 2004 Jeremy Katz <katzj@redhat.com> - 1.0.7-1
+- update to 1.0.7 (#125988)
+
+* Tue May 11 2004 Jeremy Katz <katzj@redhat.com> - 1.0.5-3
+- obsolete ipr-utils (old package name)
+
+* Thu Mar 25 2004 Jeremy Katz <katzj@redhat.com> 1.0.5-2
+- 1.0.5
+- some spec file tweaks
+
+* Tue Nov 25 2003 Brian King <brking@us.ibm.com> 1.0.3-2
+- Fixed segmentation fault in iprupdate