From a986bb3996ffd79af8f53fb25a3e929d86579614 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 18:14:40 +0000 Subject: [PATCH 01/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index a38036a..b83efae 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 9.git%{shortcommit0}%{?dist} +Release: 10.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -82,6 +82,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.32-10.git9834b34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1.0.32-9.git9834b34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 70fee8160c3ab5a9baa93e8ecebd393b2cefe3ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:15:23 +0000 Subject: [PATCH 02/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index b83efae..e5c9e92 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 10.git%{shortcommit0}%{?dist} +Release: 11.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -82,6 +82,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.0.32-11.git9834b34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.0.32-10.git9834b34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From eb7fd0b199a4fa90c167872fd4ba67a2e5e49317 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:57:48 +0000 Subject: [PATCH 03/30] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index e5c9e92..f5500c5 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 11.git%{shortcommit0}%{?dist} +Release: 12.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -82,6 +82,10 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.0.32-12.git9834b34 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.0.32-11.git9834b34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 178354d795c92f1d2711a04c8c3b0ca839e67c54 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Fri, 18 Sep 2020 19:50:37 -0700 Subject: [PATCH 04/30] FTBFS: fix gcc 10.2 truncation and overflow errors rebase to 1.0.33+ from new upstream location --- ...ncation-format-truncation-and-format.patch | 444 ++++++++++++++++ 0001-string-warning-fixes.patch | 490 ------------------ ...itialized-values-detected-during-LTO.patch | 51 ++ fcoe-utils.spec | 19 +- sources | 2 +- 5 files changed, 508 insertions(+), 498 deletions(-) create mode 100644 0001-21-string-op-truncation-format-truncation-and-format.patch delete mode 100644 0001-string-warning-fixes.patch create mode 100644 0002-use-of-uninitialized-values-detected-during-LTO.patch diff --git a/0001-21-string-op-truncation-format-truncation-and-format.patch b/0001-21-string-op-truncation-format-truncation-and-format.patch new file mode 100644 index 0000000..1e569ad --- /dev/null +++ b/0001-21-string-op-truncation-format-truncation-and-format.patch @@ -0,0 +1,444 @@ +From 329d7721a40e94547186bf680ba5ae033dda3006 Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Fri, 18 Sep 2020 10:20:57 -0700 +Subject: [PATCH 1/1] 21 string-op truncation, format truncation, and format + overflow errors + +This isn't a full audit of the source, just addressing anything gcc 10.2 flagged. + +There's two basic mitigations added, depending on the likelyhood and severity +of truncation to correct functioning. + +1) When a truncation is unlikely (copy between two IFNAMSIZ buffers) or +non-critical (output formating) I forced a null-terminiation at the buffer end +after a strncpy to satisfy the compiler. + +2) Where truncation needs proper detection and handling, I used snprintf and +corrected the error checking. + +Signed-off-by: Chris Leech +--- + fcoeadm.c | 8 +++--- + fcoeadm_display.c | 62 ++++++++++++++++++++++++++++++++++------------- + fcoemon.c | 44 ++++++++++++++++++++++++++------- + fipvlan.c | 5 +++- + lib/fcoe_utils.c | 17 ++++++------- + lib/sysfs_hba.c | 6 +++++ + libopenfcoe.c | 4 ++- + 7 files changed, 106 insertions(+), 40 deletions(-) + +diff --git a/fcoeadm.c b/fcoeadm.c +index 776b4e32b2e..8b9112d63c3 100644 +--- a/fcoeadm.c ++++ b/fcoeadm.c +@@ -185,9 +185,10 @@ fcoeadm_action(enum clif_action cmd, char *ifname, enum clif_flags flags) + struct clif_sock_info clif_info; + int rc; + +- if (ifname) +- strncpy(data.ifname, ifname, sizeof(data.ifname)); +- else ++ if (ifname) { ++ strncpy(data.ifname, ifname, IFNAMSIZ); ++ data.ifname[IFNAMSIZ - 1] = '\0'; ++ } else + data.ifname[0] = '\0'; + data.cmd = cmd; + data.flags = flags; +@@ -232,6 +233,7 @@ int main(int argc, char *argv[]) + * expects progname to be valid. + */ + strncpy(progname, basename(argv[0]), sizeof(progname)); ++ progname[sizeof(progname) - 1] = '\0'; + + /* check if we have sysfs */ + if (fcoe_checkdir(SYSFS_MOUNT)) { +diff --git a/fcoeadm_display.c b/fcoeadm_display.c +index 7d29422e91f..4b1d358d1c8 100644 +--- a/fcoeadm_display.c ++++ b/fcoeadm_display.c +@@ -188,6 +188,7 @@ static void sa_dir_crawl(char *dir_name, + struct dirent *dp; + void (*f)(char *dirname, enum disp_style style); + char path[1024]; ++ int rc; + + f = func; + +@@ -199,8 +200,9 @@ static void sa_dir_crawl(char *dir_name, + if (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || + (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))) + continue; +- snprintf(path, sizeof(path), "%s/%s", dir_name, dp->d_name); +- ++ rc = snprintf(path, sizeof(path), "%s/%s", dir_name, dp->d_name); ++ if (rc < 0 || (size_t) rc >= sizeof(path)) ++ continue; + f(path, style); + } + closedir(dir); +@@ -254,10 +256,13 @@ static void show_full_lun_info(unsigned int hba, unsigned int port, + struct dirent *dp; + struct port_attributes *rport_attrs; + struct port_attributes *port_attrs; ++ int rc; + +- snprintf(path, sizeof(path), +- "/sys/class/scsi_device/%u:%u:%u:%u", +- hba, port, tgt, lun); ++ rc = snprintf(path, sizeof(path), ++ "/sys/class/scsi_device/%u:%u:%u:%u", ++ hba, port, tgt, lun); ++ if (rc < 0 || (size_t) rc >= sizeof(path)) ++ return; + + rport_attrs = get_rport_attribs_by_device(path); + if (!rport_attrs) +@@ -287,10 +292,14 @@ static void show_full_lun_info(unsigned int hba, unsigned int port, + + osname = dp->d_name; + +- snprintf(npath, sizeof(npath), "%s/%s/", path, osname); ++ rc = snprintf(npath, sizeof(npath), "%s/%s/", path, osname); ++ if (rc < 0 || (size_t) rc >= sizeof(npath)) ++ continue; + sa_sys_read_u64(npath, "size", &lba); + +- snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); ++ rc = snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); ++ if (rc < 0 || (size_t) rc >= sizeof(npath)) ++ continue; + sa_sys_read_u32(npath, "hw_sector_size", &blksize); + } + +@@ -340,10 +349,13 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, + char *capstr = "Unknown"; + char *osname = "Unknown"; + uint64_t size; ++ int rc; + +- snprintf(path, sizeof(path), +- "/sys/class/scsi_device/%u:%u:%u:%u/device/", +- hba, port, tgt, lun); ++ rc = snprintf(path, sizeof(path), ++ "/sys/class/scsi_device/%u:%u:%u:%u/device/", ++ hba, port, tgt, lun); ++ if (rc < 0 || (size_t) rc >= sizeof(path)) ++ return; + + sa_sys_read_line(path, "rev", rev, sizeof(rev)); + sa_sys_read_line(path, "model", model, sizeof(model)); +@@ -363,10 +375,14 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, + + osname = dp->d_name; + +- snprintf(npath, sizeof(npath), "%s/%s/", path, osname); ++ rc = snprintf(npath, sizeof(npath), "%s/%s/", path, osname); ++ if (rc < 0 || (size_t) rc >= sizeof(npath)) ++ continue; + sa_sys_read_u64(npath, "size", &size); + +- snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); ++ rc = snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); ++ if (rc < 0 || (size_t) rc >= sizeof(npath)) ++ continue; + sa_sys_read_u32(npath, "hw_sector_size", &blksize); + } + +@@ -419,8 +435,11 @@ static void list_luns_by_rport(char *rport, enum disp_style style) + char *substr; + int len; + int ret; ++ int rc; + +- snprintf(path, sizeof(path), "/sys/class/fc_remote_ports/%s", rport); ++ rc = snprintf(path, sizeof(path), "/sys/class/fc_remote_ports/%s", rport); ++ if (rc < 0 || (size_t) rc >= sizeof(path)) ++ return; + + ret = readlink(path, link, sizeof(link)); + if (ret == -1) +@@ -430,7 +449,9 @@ static void list_luns_by_rport(char *rport, enum disp_style style) + link[ret] = '\0'; + + substr = strstr(link, "net"); +- snprintf(path, sizeof(path), "/sys/class/%s", substr); ++ rc = snprintf(path, sizeof(path), "/sys/class/%s", substr); ++ if (rc < 0 || (size_t) rc >= sizeof(path)) ++ return; + + substr = strstr(path, "fc_remote_ports"); + +@@ -560,11 +581,16 @@ static int get_host_from_vport(struct dirent *dp, + static int crawl_vports(struct dirent *dp, void *arg) + { + char *oldpath = arg; ++ int rc; + + if (!strncmp(dp->d_name, "vport", strlen("vport"))) { + char path[1024]; + +- snprintf(path, sizeof(path), "%s/%s", oldpath, dp->d_name); ++ rc = snprintf(path, sizeof(path), "%s/%s", oldpath, dp->d_name); ++ if (rc < 0 || (size_t) rc >= sizeof(path)) { ++ // ignore error and continue ++ return 0; ++ } + sa_dir_read(path, get_host_from_vport, NULL); + } + return 0; +@@ -573,10 +599,12 @@ static int crawl_vports(struct dirent *dp, void *arg) + static void show_host_vports(const char *host) + { + char path[1024]; ++ int rc; + +- snprintf(path, sizeof(path), "%s/%s/device/", SYSFS_HOST_DIR, host); ++ rc = snprintf(path, sizeof(path), "%s/%s/device/", SYSFS_HOST_DIR, host); ++ if (rc < 0 || (size_t) rc >= sizeof(path)) ++ return; + sa_dir_read(path, crawl_vports, path); +- + } + + static enum fcoe_status display_one_adapter_info(char *ifname) +diff --git a/fcoemon.c b/fcoemon.c +index 60dbc1e444d..8c08bc5a032 100644 +--- a/fcoemon.c ++++ b/fcoemon.c +@@ -518,6 +518,7 @@ static int fcm_read_config_files(void) + } + strncpy(file, CONFIG_DIR "/", sizeof(file)); + strncat(file, dp->d_name, sizeof(file) - strlen(file)); ++ file[sizeof(file) - 1] = '\0'; + fp = fopen(file, "r"); + if (!fp) { + FCM_LOG_ERR(errno, "Failed to read %s\n", file); +@@ -939,6 +940,7 @@ static struct fcoe_port *fcm_new_vlan(int ifindex, int vid, bool vn2vn) + [false] = CLIF_FLAGS_FABRIC, + [true] = CLIF_FLAGS_VN2VN, + }; ++ int rc; + + if (vn2vn) + FCM_LOG_DBG("Auto VLAN found vn2vn on VID %d\n", vid); +@@ -947,8 +949,15 @@ static struct fcoe_port *fcm_new_vlan(int ifindex, int vid, bool vn2vn) + + if (rtnl_find_vlan(ifindex, vid, vlan_name)) { + rtnl_get_linkname(ifindex, real_name); +- snprintf(vlan_name, sizeof(vlan_name), FCOE_VLAN_FORMAT, +- real_name, vid); ++ rc = snprintf(vlan_name, sizeof(vlan_name), FCOE_VLAN_FORMAT, ++ real_name, vid); ++ if (rc < 0 || (size_t) rc >= sizeof(vlan_name)) { ++ FCM_LOG("Warning: Generating FCoE VLAN device name for" ++ "interface %s VLAN %d: format resulted in a" ++ "name larger than IFNAMSIZ\n", real_name, vid); ++ vlan_name[sizeof(vlan_name) - 1] = 0; ++ FCM_LOG("\tTruncating VLAN name to %s\n", vlan_name); ++ } + vlan_create(ifindex, vid, vlan_name); + } + rtnl_set_iff_up(0, vlan_name); +@@ -1077,6 +1086,7 @@ static void fcm_vlan_dev_real_dev(char *vlan_ifname, char *real_ifname) + { + int fd; + struct vlan_ioctl_args ifv; ++ int rc; + + real_ifname[0] = '\0'; + +@@ -1093,9 +1103,18 @@ static void fcm_vlan_dev_real_dev(char *vlan_ifname, char *real_ifname) + FCM_LOG_ERR(ENOSPC, "no room for vlan ifname"); + goto close_fd; + } +- strncpy(ifv.device1, vlan_ifname, sizeof(ifv.device1)); +- if (ioctl(fd, SIOCGIFVLAN, &ifv) == 0) +- strncpy(real_ifname, ifv.u.device2, IFNAMSIZ-1); ++ ++ rc = snprintf(ifv.device1, IFNAMSIZ, "%s", vlan_ifname); ++ if (rc < 0 || rc >= IFNAMSIZ) ++ goto close_fd; ++ ++ if (ioctl(fd, SIOCGIFVLAN, &ifv) == 0) { ++ rc = snprintf(real_ifname, IFNAMSIZ, "%s", ifv.u.device2); ++ if (rc < 0 || rc >= IFNAMSIZ) { ++ real_ifname[0] = '\0'; ++ goto close_fd; ++ } ++ } + close_fd: + close(fd); + } +@@ -1647,8 +1666,10 @@ static void fcm_process_link_msg(struct ifinfomsg *ip, int len, unsigned type) + /* try to find the real device name */ + real_dev[0] = '\0'; + fcm_vlan_dev_real_dev(ifname, real_dev); +- if (strlen(real_dev)) +- strncpy(p->real_ifname, real_dev, IFNAMSIZ-1); ++ if (strlen(real_dev)) { ++ strncpy(p->real_ifname, real_dev, IFNAMSIZ); ++ p->real_ifname[IFNAMSIZ - 1] = '\0'; ++ } + if (p->ready) + update_fcoe_port_state(p, type, operstate, + FCP_CFG_IFNAME); +@@ -1660,7 +1681,8 @@ static void fcm_process_link_msg(struct ifinfomsg *ip, int len, unsigned type) + if (p) { + p->ifindex = ifindex; + memcpy(p->mac, mac, ETHER_ADDR_LEN); +- strncpy(p->real_ifname, ifname, IFNAMSIZ-1); ++ strncpy(p->real_ifname, ifname, IFNAMSIZ); ++ p->real_ifname[IFNAMSIZ - 1] = '\0'; + update_fcoe_port_state(p, type, operstate, + FCP_REAL_IFNAME); + } +@@ -1788,7 +1810,9 @@ static void fcm_process_ieee_msg(struct nlmsghdr *nlh) + if (rta_parent->rta_type != DCB_ATTR_IFNAME) + return; + +- strncpy(ifname, NLA_DATA(rta_parent), sizeof(ifname)); ++ strncpy(ifname, NLA_DATA(rta_parent), IFNAMSIZ); ++ ifname[IFNAMSIZ - 1] = '\0'; ++ + ff = fcm_netif_lookup_create(ifname); + if (!ff) { + FCM_LOG("Processing IEEE message: %s not found or created\n", +@@ -3699,6 +3723,8 @@ int main(int argc, char **argv) + memset(&fcoe_config, 0, sizeof(fcoe_config)); + + strncpy(progname, basename(argv[0]), sizeof(progname)); ++ progname[sizeof(progname) - 1] = '\0'; ++ + sa_log_prefix = progname; + sa_log_flags = 0; + openlog(sa_log_prefix, LOG_CONS, LOG_DAEMON); +diff --git a/fipvlan.c b/fipvlan.c +index 2e9a8f2b047..c8a07339314 100644 +--- a/fipvlan.c ++++ b/fipvlan.c +@@ -449,6 +449,7 @@ static void rtnl_recv_newlink(struct nlmsghdr *nh) + iff->iflink = iff->ifindex; + memcpy(iff->mac_addr, RTA_DATA(ifla[IFLA_ADDRESS]), ETHER_ADDR_LEN); + strncpy(iff->ifname, RTA_DATA(ifla[IFLA_IFNAME]), IFNAMSIZ); ++ iff->ifname[IFNAMSIZ - 1] = '\0'; + + if (ifla[IFLA_LINKINFO]) { + parse_linkinfo(linkinfo, ifla[IFLA_LINKINFO]); +@@ -541,8 +542,10 @@ static void parse_cmdline(int argc, char **argv) + config.start = true; + break; + case 'f': +- if (optarg && strlen(optarg)) ++ if (optarg && strlen(optarg)) { + strncpy(config.suffix, optarg, 256); ++ config.suffix[256 - 1] = '\0'; ++ } + break; + case 'l': + config.link_retry = strtoul(optarg, NULL, 10); +diff --git a/lib/fcoe_utils.c b/lib/fcoe_utils.c +index 516eac5247d..4d13dd7ecf9 100644 +--- a/lib/fcoe_utils.c ++++ b/lib/fcoe_utils.c +@@ -68,9 +68,10 @@ static int fcoe_check_fchost(const char *ifname, const char *dname) + + enum fcoe_status fcoe_find_fchost(const char *ifname, char *fchost, int len) + { +- int n, dname_len, status; ++ int n, status; + struct dirent **namelist; + int rc = ENOFCOECONN; ++ int rrc; + + status = n = scandir(SYSFS_FCHOST, &namelist, 0, alphasort); + +@@ -78,19 +79,17 @@ enum fcoe_status fcoe_find_fchost(const char *ifname, char *fchost, int len) + if (rc) { + /* check symbolic name */ + if (!fcoe_check_fchost(ifname, namelist[n]->d_name)) { +- dname_len = strnlen(namelist[n]->d_name, len); +- +- if (len > dname_len) { +- strncpy(fchost, namelist[n]->d_name, +- dname_len + 1); +- /* rc = 0 indicates found */ +- rc = SUCCESS; +- } else { ++ rrc = snprintf(fchost, len, "%s", namelist[n]->d_name); ++ if (rrc < 0 || rrc >= len) { ++ fchost[0] = '\0'; + /* + * The fc_host is too large + * for the buffer. + */ + rc = EINTERR; ++ } else { ++ /* rc = 0 indicates found */ ++ rc = SUCCESS; + } + } + } +diff --git a/lib/sysfs_hba.c b/lib/sysfs_hba.c +index ce781e2e0ed..a8d557e92b5 100644 +--- a/lib/sysfs_hba.c ++++ b/lib/sysfs_hba.c +@@ -215,6 +215,7 @@ static void get_pci_device_info(struct pci_device *dev, struct hba_info *info) + vname = unknown; + + strncpy(info->manufacturer, vname, sizeof(info->manufacturer)); ++ info->manufacturer[sizeof(info->manufacturer) - 1] = '\0'; + + dname = pci_device_get_device_name(dev); + if (!dname) +@@ -222,6 +223,7 @@ static void get_pci_device_info(struct pci_device *dev, struct hba_info *info) + + strncpy(info->model_description, dname, + sizeof(info->model_description)); ++ info->model_description[sizeof(info->model_description) - 1] = '\0'; + + pci_device_cfg_read_u8(dev, &revision, PCI_REVISION_ID); + snprintf(info->hardware_version, sizeof(info->hardware_version), +@@ -259,6 +261,7 @@ static void get_module_info(const char *pcidev, struct hba_info *info) + strncpy(info->driver_name, + strstr(buf, "module") + strlen("module") + 1, + sizeof(info->driver_name)); ++ info->driver_name[sizeof(info->driver_name) - 1] = '\0'; + + } + +@@ -316,6 +319,8 @@ struct port_attributes *get_rport_attribs(const char *rport) + goto free_path; + + strncpy(pa->device_name, rport, sizeof(pa->device_name)); ++ pa->device_name[sizeof(pa->device_name) - 1] = '\0'; ++ + sa_sys_read_line(path, "node_name", pa->node_name, + sizeof(pa->node_name)); + sa_sys_read_line(path, "port_name", pa->port_name, +@@ -391,6 +396,7 @@ struct port_attributes *get_port_attribs(const char *host) + goto free_path; + + strncpy(pa->device_name, host, sizeof(pa->device_name)); ++ pa->device_name[sizeof(pa->device_name) - 1] = '\0'; + + sa_sys_read_line(path, "symbolic_name", pa->symbolic_name, + sizeof(pa->symbolic_name)); +diff --git a/libopenfcoe.c b/libopenfcoe.c +index c3fd1b031f8..452ee803e63 100644 +--- a/libopenfcoe.c ++++ b/libopenfcoe.c +@@ -207,7 +207,9 @@ static int read_fcoe_ctlr_device(struct dirent *dp, void *arg) + if (!rc) + goto fail; + +- sprintf(hpath, "%s/%s/", SYSFS_FCHOST, fchost); ++ rc = snprintf(hpath, MAX_STR_LEN, "%s/%s/", SYSFS_FCHOST, fchost); ++ if (rc < 0 || rc >= MAX_STR_LEN) ++ goto fail; + + rc = sa_sys_read_line(hpath, "symbolic_name", buf, sizeof(buf)); + +-- +2.18.1 + diff --git a/0001-string-warning-fixes.patch b/0001-string-warning-fixes.patch deleted file mode 100644 index 8128ee1..0000000 --- a/0001-string-warning-fixes.patch +++ /dev/null @@ -1,490 +0,0 @@ -From 1bc240f074767a2c23efaf413d6ce96fdedcda2e Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Mon, 3 Jun 2019 18:37:59 -0700 -Subject: [PATCH 1/1] use libbsd strlcpy - -gcc7 fmt truncation errors - -fix build warnings/errors with GCC format-truncation checks - -more libbsd ---- - Makefile.am | 17 ++++++++++------- - configure.ac | 2 ++ - fcoeadm.c | 4 ++-- - fcoeadm_display.c | 32 +++++++++++++++++++++++++------- - fcoemon.c | 37 +++++++++++++++++++++++-------------- - fipvlan.c | 10 ++++++---- - lib/rtnetlink.c | 2 +- - lib/sysfs_hba.c | 16 ++++++++-------- - libopenfcoe.c | 19 +++++++++++++------ - 9 files changed, 90 insertions(+), 49 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ba302e09d94..b8bc810af19 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -9,29 +9,32 @@ AM_CFLAGS = -Wall -Wformat=2 -Werror -Wmissing-prototypes -Wstrict-prototypes - - ## rules for building fcoeadm - fcoeadm_SOURCES = fcoeadm.c fcoeadm_display.c --fcoeadm_LDADD = lib/libutil.a libopenfcoe.a $(PCIACCESS_LIBS) --fcoeadm_CFLAGS = $(AM_CFLAGS) -+fcoeadm_LDADD = lib/libutil.a libopenfcoe.a $(PCIACCESS_LIBS) $(LIBBSD_LIBS) -+fcoeadm_CFLAGS = $(AM_CFLAGS) $(LIBBSD_CFLAGS) - - ## rules for building fcoemon - fcoemon_SOURCES = fcoemon.c --fcoemon_LDADD = lib/libutil.a -lrt --fcoemon_CFLAGS = $(AM_CFLAGS) $(DCBD_CFLAGS) -+fcoemon_LDADD = lib/libutil.a -lrt $(LIBBSD_LIBS) -+fcoemon_CFLAGS = $(AM_CFLAGS) $(DCBD_CFLAGS) $(LIBBSD_CFLAGS) - - ## rules for building fcping - fcping_SOURCES = fcping.c --fcping_LDADD = lib/libutil.a libopenfcoe.a $(PCIACCESS_LIBS) -lrt --fcping_CFLAGS = $(AM_CFLAGS) -+fcping_LDADD = lib/libutil.a libopenfcoe.a $(PCIACCESS_LIBS) -lrt $(LIBBSD_LIBS) -+fcping_CFLAGS = $(AM_CFLAGS) $(LIBBSD_CFLAGS) - - ## rules for building fipvlan - fipvlan_SOURCES = fipvlan.c --fipvlan_LDADD = lib/libutil.a -+fipvlan_LDADD = lib/libutil.a $(LIBBSD_LIBS) -+fipvlan_CFLAGS = $(AM_CFLAGS) $(LIBBSD_CFLAGS) - - AUTOMAKE_OPTIONS=subdir-objects - noinst_LIBRARIES = lib/libutil.a libopenfcoe.a - lib_libutil_a_SOURCES = lib/fcoe_utils.c lib/sa_log.c lib/sa_select.c \ - lib/sa_timer.c lib/sa_other.c lib/fip.c lib/rtnetlink.c lib/sa_sys.c \ - lib/sysfs_hba.c -+lib_libutil_a_CFLAGS = $(AM_CFLAGS) $(LIBBSD_CFLAGS) - libopenfcoe_a_SOURCES = libopenfcoe.c -+libopenfcoe_a_CFLAGS = $(AM_CFLAGS) $(LIBBSD_CFLAGS) - - ## header files that need to be distributed - noinst_HEADERS = fcoeadm_display.h fcoe_clif.h fcoemon.h \ -diff --git a/configure.ac b/configure.ac -index 6bc073b221c..f1612e490cb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,6 +13,8 @@ AC_SUBST([LLDPAD_CFLAGS]) - PKG_CHECK_MODULES([PCIACCESS], [pciaccess]) - AC_SUBST([PCIACCESS_LIBS]) - -+PKG_CHECK_MODULES([LIBBSD], [libbsd-overlay]) -+ - PKG_PROG_PKG_CONFIG - AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], -diff --git a/fcoeadm.c b/fcoeadm.c -index 776b4e32b2e..6e143596129 100644 ---- a/fcoeadm.c -+++ b/fcoeadm.c -@@ -186,7 +186,7 @@ fcoeadm_action(enum clif_action cmd, char *ifname, enum clif_flags flags) - int rc; - - if (ifname) -- strncpy(data.ifname, ifname, sizeof(data.ifname)); -+ strlcpy(data.ifname, ifname, sizeof(data.ifname)); - else - data.ifname[0] = '\0'; - data.cmd = cmd; -@@ -231,7 +231,7 @@ int main(int argc, char *argv[]) - * This has to be first because the error print macro - * expects progname to be valid. - */ -- strncpy(progname, basename(argv[0]), sizeof(progname)); -+ strlcpy(progname, basename(argv[0]), sizeof(progname)); - - /* check if we have sysfs */ - if (fcoe_checkdir(SYSFS_MOUNT)) { -diff --git a/fcoeadm_display.c b/fcoeadm_display.c -index 120c6084b7c..2c6214db29a 100644 ---- a/fcoeadm_display.c -+++ b/fcoeadm_display.c -@@ -254,6 +254,7 @@ static void show_full_lun_info(unsigned int hba, unsigned int port, - struct dirent *dp; - struct port_attributes *rport_attrs; - struct port_attributes *port_attrs; -+ int rc; - - snprintf(path, sizeof(path), - "/sys/class/scsi_device/%u:%u:%u:%u", -@@ -267,13 +268,13 @@ static void show_full_lun_info(unsigned int hba, unsigned int port, - if (!port_attrs) - goto free_rport; - -- strncat(path, "/device/", sizeof(path) - strlen(path) - 1); -+ strlcat(path, "/device/", sizeof(path)); - - sa_sys_read_line(path, "rev", rev, sizeof(rev)); - sa_sys_read_line(path, "model", model, sizeof(model)); - sa_sys_read_line(path, "vendor", vendor, sizeof(vendor)); - -- strncat(path, "block", sizeof(path) - strlen(path) - 1); -+ strlcat(path, "block", sizeof(path)); - - dir = opendir(path); - if (!dir) -@@ -287,10 +288,18 @@ static void show_full_lun_info(unsigned int hba, unsigned int port, - - osname = dp->d_name; - -- snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ if (rc < 0 || rc >= sizeof(npath)) { -+ /* error or truncation, bailing out */ -+ return; -+ } - sa_sys_read_u64(npath, "size", &lba); - -- snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ if (rc < 0 || rc >= sizeof(npath)) { -+ /* error or truncation, bailing out */ -+ return; -+ } - sa_sys_read_u32(npath, "hw_sector_size", &blksize); - } - -@@ -340,6 +349,7 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, - char *capstr = "Unknown"; - char *osname = "Unknown"; - uint64_t size; -+ int rc; - - snprintf(path, sizeof(path), - "/sys/class/scsi_device/%u:%u:%u:%u/device/", -@@ -349,7 +359,7 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, - sa_sys_read_line(path, "model", model, sizeof(model)); - sa_sys_read_line(path, "vendor", vendor, sizeof(vendor)); - -- strncat(path, "block", sizeof(path) - strlen(path) - 1); -+ strlcat(path, "block", sizeof(path)); - - dir = opendir(path); - if (!dir) -@@ -363,10 +373,18 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, - - osname = dp->d_name; - -- snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ if (rc < 0 || rc >= sizeof(npath)) { -+ /* error or truncation, bailing out */ -+ return; -+ } - sa_sys_read_u64(npath, "size", &size); - -- snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ if (rc < 0 || rc >= sizeof(npath)) { -+ /* error or truncation, bailing out */ -+ return; -+ } - sa_sys_read_u32(npath, "hw_sector_size", &blksize); - } - -diff --git a/fcoemon.c b/fcoemon.c -index 9af0f1284af..10f978b19ec 100644 ---- a/fcoemon.c -+++ b/fcoemon.c -@@ -378,8 +378,8 @@ static int fcm_remove_quotes(char *buf, int len) - return -1; - s = buf + 1; - *e = '\0'; -- strncpy(tmp, s, len - 1); -- strncpy(buf, tmp, len - 1); -+ strlcpy(tmp, s, len); -+ strlcpy(buf, tmp, len); - - return 0; - } -@@ -516,8 +516,8 @@ static int fcm_read_config_files(void) - dp->d_name); - continue; - } -- strncpy(file, CONFIG_DIR "/", sizeof(file)); -- strncat(file, dp->d_name, sizeof(file) - strlen(file)); -+ strlcpy(file, CONFIG_DIR "/", sizeof(file)); -+ strlcat(file, dp->d_name, sizeof(file)); - fp = fopen(file, "r"); - if (!fp) { - FCM_LOG_ERR(errno, "Failed to read %s\n", file); -@@ -937,6 +937,7 @@ static struct fcoe_port *fcm_new_vlan(int ifindex, int vid, bool vn2vn) - [false] = CLIF_FLAGS_FABRIC, - [true] = CLIF_FLAGS_VN2VN, - }; -+ int rc; - - if (vn2vn) - FCM_LOG_DBG("Auto VLAN found vn2vn on VID %d\n", vid); -@@ -945,8 +946,15 @@ static struct fcoe_port *fcm_new_vlan(int ifindex, int vid, bool vn2vn) - - if (rtnl_find_vlan(ifindex, vid, vlan_name)) { - rtnl_get_linkname(ifindex, real_name); -- snprintf(vlan_name, sizeof(vlan_name), FCOE_VLAN_FORMAT, -- real_name, vid); -+ rc = snprintf(vlan_name, sizeof(vlan_name), FCOE_VLAN_FORMAT, -+ real_name, vid); -+ if (rc >= sizeof(vlan_name)) { -+ FCM_LOG("Warning: Generating FCoE VLAN device name for" -+ "interface %s VLAN %d: format resulted in a" -+ "name larger than IFNAMSIZ\n", real_name, vid); -+ vlan_name[sizeof(vlan_name) - 1] = 0; -+ FCM_LOG("\tTruncating VLAN name to %s\n", vlan_name); -+ } - vlan_create(ifindex, vid, vlan_name); - } - rtnl_set_iff_up(0, vlan_name); -@@ -1087,9 +1095,10 @@ static void fcm_vlan_dev_real_dev(char *vlan_ifname, char *real_ifname) - - memset(&ifv, 0, sizeof(ifv)); - ifv.cmd = GET_VLAN_REALDEV_NAME_CMD; -- strncpy(ifv.device1, vlan_ifname, strlen(vlan_ifname)+1); -+ strlcpy(ifv.device1, vlan_ifname, sizeof(ifv.device1)); -+ - if (ioctl(fd, SIOCGIFVLAN, &ifv) == 0) -- strncpy(real_ifname, ifv.u.device2, strlen(ifv.u.device2)+1); -+ strlcpy(real_ifname, ifv.u.device2, IFNAMSIZ); - close(fd); - } - -@@ -1318,7 +1327,7 @@ static void ieee_get_req(struct fcm_netif *ff) - msg.dcbmsg.dcb_pad = 0; - msg.rta.rta_len = NLMSG_ALIGN(NLA_HDRLEN + iflen + 1); - msg.rta.rta_type = DCB_ATTR_IFNAME; -- strncpy(msg.ifname, ff->ifname, iflen); -+ strlcpy(msg.ifname, ff->ifname, IFNAMSIZ); - ff->ieee_resp_pending = seq; - rc = write(fcm_link_socket, &msg, msg.nl.nlmsg_len); - if (rc < 0) { -@@ -1641,7 +1650,7 @@ static void fcm_process_link_msg(struct ifinfomsg *ip, int len, unsigned type) - real_dev[0] = '\0'; - fcm_vlan_dev_real_dev(ifname, real_dev); - if (strlen(real_dev)) -- strncpy(p->real_ifname, real_dev, strlen(real_dev)+1); -+ strlcpy(p->real_ifname, real_dev, IFNAMSIZ); - if (p->ready) - update_fcoe_port_state(p, type, operstate, - FCP_CFG_IFNAME); -@@ -1653,7 +1662,7 @@ static void fcm_process_link_msg(struct ifinfomsg *ip, int len, unsigned type) - if (p) { - p->ifindex = ifindex; - memcpy(p->mac, mac, ETHER_ADDR_LEN); -- strncpy(p->real_ifname, ifname, strlen(ifname)+1); -+ strlcpy(p->real_ifname, ifname, IFNAMSIZ); - update_fcoe_port_state(p, type, operstate, - FCP_REAL_IFNAME); - } -@@ -1781,7 +1790,7 @@ static void fcm_process_ieee_msg(struct nlmsghdr *nlh) - if (rta_parent->rta_type != DCB_ATTR_IFNAME) - return; - -- strncpy(ifname, NLA_DATA(rta_parent), sizeof(ifname)); -+ strlcpy(ifname, NLA_DATA(rta_parent), IFNAMSIZ); - ff = fcm_netif_lookup_create(ifname); - if (!ff) { - FCM_LOG("Processing IEEE message: %s not found or created\n", -@@ -3531,7 +3540,7 @@ static void fcm_srv_receive(void *arg) - } - - cmd = data->cmd; -- strncpy(ifname, data->ifname, sizeof(data->ifname)); -+ strlcpy(ifname, data->ifname, IFNAMSIZ); - ifname[sizeof(data->ifname)] = 0; - - if (cmd != CLIF_PID_CMD) { -@@ -3686,7 +3695,7 @@ int main(int argc, char **argv) - - memset(&fcoe_config, 0, sizeof(fcoe_config)); - -- strncpy(progname, basename(argv[0]), sizeof(progname)); -+ strlcpy(progname, basename(argv[0]), sizeof(progname)); - sa_log_prefix = progname; - sa_log_flags = 0; - openlog(sa_log_prefix, LOG_CONS, LOG_DAEMON); -diff --git a/fipvlan.c b/fipvlan.c -index 7c00c7c2fec..1d6ca61d738 100644 ---- a/fipvlan.c -+++ b/fipvlan.c -@@ -448,7 +448,7 @@ static void rtnl_recv_newlink(struct nlmsghdr *nh) - else - iff->iflink = iff->ifindex; - memcpy(iff->mac_addr, RTA_DATA(ifla[IFLA_ADDRESS]), ETHER_ADDR_LEN); -- strncpy(iff->ifname, RTA_DATA(ifla[IFLA_IFNAME]), IFNAMSIZ); -+ strlcpy(iff->ifname, RTA_DATA(ifla[IFLA_IFNAME]), IFNAMSIZ); - - if (ifla[IFLA_LINKINFO]) { - parse_linkinfo(linkinfo, ifla[IFLA_LINKINFO]); -@@ -542,7 +542,7 @@ static void parse_cmdline(int argc, char **argv) - break; - case 'f': - if (optarg && strlen(optarg)) -- strncpy(config.suffix, optarg, 256); -+ strlcpy(config.suffix, optarg, 256); - break; - case 'l': - config.link_retry = strtoul(optarg, NULL, 10); -@@ -621,8 +621,10 @@ create_and_start_vlan(struct fcf *fcf, bool vn2vn) - real_dev->ifname, fcf->vlan, vlan->ifname); - rc = 0; - } else { -- snprintf(vlan_name, IFNAMSIZ, "%s.%d%s", -- real_dev->ifname, fcf->vlan, config.suffix); -+ rc = snprintf(vlan_name, IFNAMSIZ, "%s.%d%s", -+ real_dev->ifname, fcf->vlan, config.suffix); -+ if (rc >= IFNAMSIZ) -+ return -E2BIG; - rc = vlan_create(fcf->ifindex, fcf->vlan, vlan_name); - if (rc < 0) - printf("Failed to create VLAN device %s\n\t%s\n", -diff --git a/lib/rtnetlink.c b/lib/rtnetlink.c -index 3b841371899..07518e39224 100644 ---- a/lib/rtnetlink.c -+++ b/lib/rtnetlink.c -@@ -378,7 +378,7 @@ static int rtnl_getlinkname_handler(struct nlmsghdr *nh, void *arg) - switch (nh->nlmsg_type) { - case RTM_NEWLINK: - parse_ifinfo(ifla, nh); -- strncpy(name, RTA_DATA(ifla[IFLA_IFNAME]), IFNAMSIZ); -+ strlcpy(name, RTA_DATA(ifla[IFLA_IFNAME]), IFNAMSIZ); - return 0; - } - return -1; -diff --git a/lib/sysfs_hba.c b/lib/sysfs_hba.c -index 786215440ba..6db5ece3754 100644 ---- a/lib/sysfs_hba.c -+++ b/lib/sysfs_hba.c -@@ -214,13 +214,13 @@ static void get_pci_device_info(struct pci_device *dev, struct hba_info *info) - if (!vname) - vname = unknown; - -- strncpy(info->manufacturer, vname, sizeof(info->manufacturer)); -+ strlcpy(info->manufacturer, vname, sizeof(info->manufacturer)); - - dname = pci_device_get_device_name(dev); - if (!dname) - dname = unknown; - -- strncpy(info->model_description, dname, -+ strlcpy(info->model_description, dname, - sizeof(info->model_description)); - - pci_device_cfg_read_u8(dev, &revision, PCI_REVISION_ID); -@@ -238,8 +238,8 @@ static void get_module_info(const char *pcidev, struct hba_info *info) - char *path; - int err; - -- strncpy(info->driver_name, "Unknown", sizeof(info->driver_name)); -- strncpy(info->driver_version, "Unknown", sizeof(info->driver_version)); -+ strlcpy(info->driver_name, "Unknown", sizeof(info->driver_name)); -+ strlcpy(info->driver_version, "Unknown", sizeof(info->driver_version)); - - err = asprintf(&path, "/sys/bus/pci/devices/%s/driver/module", pcidev); - if (err == -1) -@@ -256,7 +256,7 @@ static void get_module_info(const char *pcidev, struct hba_info *info) - buf[err] = '\0'; - - if (strstr(buf, "module")) -- strncpy(info->driver_name, -+ strlcpy(info->driver_name, - strstr(buf, "module") + strlen("module") + 1, - sizeof(info->driver_name)); - -@@ -315,7 +315,7 @@ struct port_attributes *get_rport_attribs(const char *rport) - if (!pa) - goto free_path; - -- strncpy(pa->device_name, rport, sizeof(pa->device_name)); -+ strlcpy(pa->device_name, rport, sizeof(pa->device_name)); - sa_sys_read_line(path, "node_name", pa->node_name, - sizeof(pa->node_name)); - sa_sys_read_line(path, "port_name", pa->port_name, -@@ -390,7 +390,7 @@ struct port_attributes *get_port_attribs(const char *host) - if (!pa) - goto free_path; - -- strncpy(pa->device_name, host, sizeof(pa->device_name)); -+ strlcpy(pa->device_name, host, sizeof(pa->device_name)); - - sa_sys_read_line(path, "symbolic_name", pa->symbolic_name, - sizeof(pa->symbolic_name)); -@@ -443,7 +443,7 @@ char *get_pci_dev_from_netdev(const char *netdev) - return NULL; - - len = strlen(netdev) - strlen(subif); -- strncpy(realdev, netdev, len); -+ strlcpy(realdev, netdev, sizeof(realdev)); - if (realdev[len] != '\0') - realdev[len] = '\0'; - -diff --git a/libopenfcoe.c b/libopenfcoe.c -index 07090d5a09a..27389bac9ec 100644 ---- a/libopenfcoe.c -+++ b/libopenfcoe.c -@@ -59,6 +59,7 @@ static int add_fcoe_fcf_device(struct dirent *dp, void *arg) - { - struct fcoe_ctlr_device *ctlr = (struct fcoe_ctlr_device *)arg; - struct fcoe_fcf_device *fcf; -+ int rc; - - if (!strstr(dp->d_name, "fcf") || - (!strcmp(dp->d_name, "fcf_dev_loss_tmo"))) -@@ -71,8 +72,10 @@ static int add_fcoe_fcf_device(struct dirent *dp, void *arg) - memset(fcf, 0, sizeof(struct fcoe_fcf_device)); - - /* Save the path */ -- snprintf(fcf->path, sizeof(fcf->path), -- "%s/%s", ctlr->path, dp->d_name); -+ rc = snprintf(fcf->path, sizeof(fcf->path), -+ "%s/%s", ctlr->path, dp->d_name); -+ if (rc >= sizeof(fcf->path)) -+ goto fail; - - /* Use the index from the logical enumeration */ - fcf->index = atoi(dp->d_name + sizeof("fcf_") - 1); -@@ -140,7 +143,7 @@ static int find_fchost(struct dirent *dp, void *arg) - char *fchost = arg; - - if (strstr(dp->d_name, "host")) { -- strncpy(fchost, dp->d_name, MAX_STR_LEN); -+ strlcpy(fchost, dp->d_name, MAX_STR_LEN); - return 1; - } - -@@ -179,7 +182,9 @@ static int read_fcoe_ctlr_device(struct dirent *dp, void *arg) - if (!rc) - goto fail; - -- sprintf(hpath, "%s/%s/", SYSFS_FCHOST, fchost); -+ rc = snprintf(hpath, MAX_STR_LEN, "%s/%s/", SYSFS_FCHOST, fchost); -+ if (rc < 0 || rc >= MAX_STR_LEN) -+ goto fail; - - rc = sa_sys_read_line(hpath, "symbolic_name", buf, sizeof(buf)); - -@@ -189,7 +194,7 @@ static int read_fcoe_ctlr_device(struct dirent *dp, void *arg) - goto fail; - - ifname = get_ifname_from_symbolic_name(buf); -- strncpy(ctlr->ifname, ifname, IFNAMSIZ-1); -+ strlcpy(ctlr->ifname, ifname, IFNAMSIZ); - - /* Get fcf device loss timeout */ - sa_sys_read_u32(ctlr->path, "fcf_dev_loss_tmo", -@@ -198,7 +203,9 @@ static int read_fcoe_ctlr_device(struct dirent *dp, void *arg) - sa_sys_read_line(ctlr->path, "mode", buf, sizeof(buf)); - sa_enum_encode(fip_conn_type_table, buf, &ctlr->mode); - -- snprintf(lesb_path, sizeof(lesb_path), "%s/lesb/", ctlr->path); -+ rc = snprintf(lesb_path, sizeof(lesb_path), "%s/lesb/", ctlr->path); -+ if (rc >= sizeof(lesb_path)) -+ goto fail; - - /* Get LESB statistics */ - sa_sys_read_u32(lesb_path, "link_fail", --- -2.21.0 - diff --git a/0002-use-of-uninitialized-values-detected-during-LTO.patch b/0002-use-of-uninitialized-values-detected-during-LTO.patch new file mode 100644 index 0000000..ae04024 --- /dev/null +++ b/0002-use-of-uninitialized-values-detected-during-LTO.patch @@ -0,0 +1,51 @@ +From 64254aee4509192831b9f9cf695abd81a9656f00 Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Mon, 21 Sep 2020 09:33:23 -0700 +Subject: [PATCH 2/2] use of uninitialized values detected during LTO + +lto-wrapper build errors + +Signed-off-by: Chris Leech +--- + fcoeadm_display.c | 2 +- + lib/sysfs_hba.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fcoeadm_display.c b/fcoeadm_display.c +index 4b1d358d1c8..585ecfae54e 100644 +--- a/fcoeadm_display.c ++++ b/fcoeadm_display.c +@@ -348,7 +348,7 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, + uint32_t blksize = 0; + char *capstr = "Unknown"; + char *osname = "Unknown"; +- uint64_t size; ++ uint64_t size = 0; + int rc; + + rc = snprintf(path, sizeof(path), +diff --git a/lib/sysfs_hba.c b/lib/sysfs_hba.c +index a8d557e92b5..381f335d7ea 100644 +--- a/lib/sysfs_hba.c ++++ b/lib/sysfs_hba.c +@@ -528,7 +528,7 @@ char *get_host_by_fcid(uint32_t fcid) + DIR *dir; + char *host = NULL; + char path[1024]; +- uint32_t port_id; ++ uint32_t port_id = 0; + + dir = opendir(SYSFS_HOST_DIR); + if (!dir) +@@ -562,7 +562,7 @@ char *get_rport_by_fcid(uint32_t fcid) + DIR *dir; + char *rport = NULL; + char path[1024]; +- uint32_t port_id; ++ uint32_t port_id = 0; + + dir = opendir(SYSFS_RPORT_DIR); + if (!dir) +-- +2.18.1 + diff --git a/fcoe-utils.spec b/fcoe-utils.spec index f5500c5..4e5e79a 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,22 +1,23 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags %global _hardened_build 1 -# v1.0.32-3-g9834b340d82 -%global commit0 9834b340d8289bab48d961b6bb2698bab1f3965f +# v1.0.33-6-gfe376de5343 +%global commit0 fe376de5343c58f108a14e67819626424054591b %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: fcoe-utils -Version: 1.0.32 -Release: 12.git%{shortcommit0}%{?dist} +Version: 1.0.33 +Release: 0.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org -Source0: https://github.com/morbidrsa/fcoe-utils/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tar.gz +Source0: https://github.com/openSUSE/fcoe-utils/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tar.gz Source1: quickstart.txt Source2: fcoe.service Source3: fcoe.config ExcludeArch: ppc s390 -Patch0: 0001-string-warning-fixes.patch +Patch1: 0001-21-string-op-truncation-format-truncation-and-format.patch +Patch2: 0002-s390x-lto-wrapper-build-errors.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libpciaccess-devel @@ -78,10 +79,14 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_sysconfdir}/fcoe/ %config(noreplace) %{_sysconfdir}/fcoe/cfg-ethx %config(noreplace) %{_sysconfdir}/sysconfig/fcoe -%{_sysconfdir}/bash_completion.d/* +%{_datadir}/bash-completion/completions/* %{_libexecdir}/fcoe/ %changelog +* Mon Sep 21 2020 Chris Leech - 1.0.33-0.gitfe376de +- FTBFS: fix gcc 10.2 truncation and overflow errors +- rebase to 1.0.33+ from new upstream location + * Sat Aug 01 2020 Fedora Release Engineering - 1.0.32-12.git9834b34 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 27a86c8..1dc9485 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fcoe-utils-1.0.32-9834b34.tar.gz) = bbe9af0b277fd1b5e0a14b5865fdaa5812142cce33a2440a9ecf44e0607a4284d1a3402c72b4a3408f5aa87dafbb19de9c22f3a45cc35d092901475f9cddcc0a +SHA512 (fcoe-utils-1.0.33-fe376de.tar.gz) = 76f4225b6a235f955fd39499987d5dfef0dfd5d00fe603770b3ff162348b962d2c11b8b567a389314ca8284f110e155fe5e31b78511ad129a636c88ed25d4f3d From 375a864686d6655451d881100ee33dc86adfec90 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Tue, 22 Sep 2020 09:10:30 -0700 Subject: [PATCH 05/30] patch name was wrong? --- fcoe-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 4e5e79a..4809eac 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -17,7 +17,7 @@ Source2: fcoe.service Source3: fcoe.config ExcludeArch: ppc s390 Patch1: 0001-21-string-op-truncation-format-truncation-and-format.patch -Patch2: 0002-s390x-lto-wrapper-build-errors.patch +Patch2: 0002-use-of-uninitialized-values-detected-during-LTO.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libpciaccess-devel From b9c42614a4140680c04f04eb8b281e75954b80a1 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 28 Oct 2020 11:12:18 -0600 Subject: [PATCH 06/30] - Disable fatal diagnostics from gcc-11 for fipvlan --- fcoe-utils-gcc11.patch | 15 +++++++++++++++ fcoe-utils.spec | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 fcoe-utils-gcc11.patch diff --git a/fcoe-utils-gcc11.patch b/fcoe-utils-gcc11.patch new file mode 100644 index 0000000..e9b29fe --- /dev/null +++ b/fcoe-utils-gcc11.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile.am b/Makefile.am +index 2f323e4..d6bc3c3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -25,6 +25,10 @@ fcping_CFLAGS = $(AM_CFLAGS) + ## rules for building fipvlan + fipvlan_SOURCES = fipvlan.c + fipvlan_LDADD = lib/libutil.a ++# These look like valid warnings, but the code may be fine in practice. Someone ++# with a deeper understanding of the source needs to chime in ++fipvlan_CFLAGS = $(AM_CFLAGS) -Wno-error=array-bounds -Wno-error=stringop-overread ++ + + AUTOMAKE_OPTIONS=subdir-objects + noinst_LIBRARIES = lib/libutil.a libopenfcoe.a diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 4809eac..2f06862 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.33 -Release: 0.git%{shortcommit0}%{?dist} +Release: 1.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -18,6 +18,7 @@ Source3: fcoe.config ExcludeArch: ppc s390 Patch1: 0001-21-string-op-truncation-format-truncation-and-format.patch Patch2: 0002-use-of-uninitialized-values-detected-during-LTO.patch +Patch3: %{name}-gcc11.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libpciaccess-devel @@ -83,6 +84,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Wed Oct 28 2020 Jeff Law - 1.0.33-1.gitfe376de +- Disable fatal diagnostics from gcc-11 for fipvlan + * Mon Sep 21 2020 Chris Leech - 1.0.33-0.gitfe376de - FTBFS: fix gcc 10.2 truncation and overflow errors - rebase to 1.0.33+ from new upstream location From fe12778cd21ad820b8e928b524d8cdc660d278c8 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 28 Oct 2020 11:45:49 -0600 Subject: [PATCH 07/30] Adjust patch so that it works for gcc-10 as well --- fcoe-utils-gcc11.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fcoe-utils-gcc11.patch b/fcoe-utils-gcc11.patch index e9b29fe..56953fa 100644 --- a/fcoe-utils-gcc11.patch +++ b/fcoe-utils-gcc11.patch @@ -8,7 +8,7 @@ index 2f323e4..d6bc3c3 100644 fipvlan_LDADD = lib/libutil.a +# These look like valid warnings, but the code may be fine in practice. Someone +# with a deeper understanding of the source needs to chime in -+fipvlan_CFLAGS = $(AM_CFLAGS) -Wno-error=array-bounds -Wno-error=stringop-overread ++fipvlan_CFLAGS = $(AM_CFLAGS) -Wno-error=array-bounds -Wno-stringop-overread + AUTOMAKE_OPTIONS=subdir-objects From 4962fcf0f984ee5ecf8c07b6538fa14638727291 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 14 Nov 2020 23:10:33 -0700 Subject: [PATCH 08/30] Disable fatal diagnostic from gcc-11 for fping --- fcoe-utils-gcc11.patch | 13 +++++++++++++ fcoe-utils.spec | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/fcoe-utils-gcc11.patch b/fcoe-utils-gcc11.patch index 56953fa..3614194 100644 --- a/fcoe-utils-gcc11.patch +++ b/fcoe-utils-gcc11.patch @@ -13,3 +13,16 @@ index 2f323e4..d6bc3c3 100644 AUTOMAKE_OPTIONS=subdir-objects noinst_LIBRARIES = lib/libutil.a libopenfcoe.a +diff --git a/Makefile.am b/Makefile.am +index 11262ec..08bc207 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,7 @@ fcoemon_CFLAGS = $(AM_CFLAGS) $(DCBD_CFLAGS) + ## rules for building fcping + fcping_SOURCES = fcping.c + fcping_LDADD = lib/libutil.a libopenfcoe.a $(PCIACCESS_LIBS) -lrt +-fcping_CFLAGS = $(AM_CFLAGS) ++fcping_CFLAGS = $(AM_CFLAGS) -Wno-error=stringop-overflow + + ## rules for building fipvlan + fipvlan_SOURCES = fipvlan.c diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 2f06862..47283b4 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.33 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -84,7 +84,10 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog -* Wed Oct 28 2020 Jeff Law - 1.0.33-1.gitfe376de +* Sat Nov 14 2020 Jeff Law - 1.0.33-2.gitfe376de +- Disable fatal diagnostic from gcc-11 for fping + +* Wed Oct 28 2020 Jeff Law - 1.0.33-1.gitfe376de - Disable fatal diagnostics from gcc-11 for fipvlan * Mon Sep 21 2020 Chris Leech - 1.0.33-0.gitfe376de From 829679b1b2068544bd6c8380652650982c095ade Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 18 Dec 2020 22:33:12 +0000 Subject: [PATCH 09/30] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- fcoe-utils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 47283b4..0a50a90 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -26,6 +26,7 @@ BuildRequires: libtool BuildRequires: lldpad-devel >= 0.9.43 BuildRequires: systemd BuildRequires: libbsd-devel +BuildRequires: make Requires: lldpad >= 0.9.43 Requires: iproute Requires: device-mapper-multipath From 99e6ad9b25444e7ff7f7a90f2621a0a26e47dd77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:21:02 +0000 Subject: [PATCH 10/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 0a50a90..43fbafd 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.33 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -85,6 +85,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.33-3.gitfe376de +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Nov 14 2020 Jeff Law - 1.0.33-2.gitfe376de - Disable fatal diagnostic from gcc-11 for fping From a24537170670e395bb019a2b85a82f2dc9769dd4 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Tue, 2 Feb 2021 10:19:14 -0800 Subject: [PATCH 11/30] drop any differences with upstream service and config files --- ...ncation-format-truncation-and-format.patch | 444 ------------------ ...itialized-values-detected-during-LTO.patch | 51 -- fcoe-utils-gcc7-fmt-truc-err.patch | 53 --- fcoe-utils-gcc8-fmt-truc-err.patch | 119 ----- fcoe-utils.spec | 39 +- fcoe.config | 5 - fcoe.service | 12 - quickstart.txt | 25 - sources | 2 +- 9 files changed, 16 insertions(+), 734 deletions(-) delete mode 100644 0001-21-string-op-truncation-format-truncation-and-format.patch delete mode 100644 0002-use-of-uninitialized-values-detected-during-LTO.patch delete mode 100644 fcoe-utils-gcc7-fmt-truc-err.patch delete mode 100644 fcoe-utils-gcc8-fmt-truc-err.patch delete mode 100644 fcoe.config delete mode 100644 fcoe.service delete mode 100644 quickstart.txt diff --git a/0001-21-string-op-truncation-format-truncation-and-format.patch b/0001-21-string-op-truncation-format-truncation-and-format.patch deleted file mode 100644 index 1e569ad..0000000 --- a/0001-21-string-op-truncation-format-truncation-and-format.patch +++ /dev/null @@ -1,444 +0,0 @@ -From 329d7721a40e94547186bf680ba5ae033dda3006 Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Fri, 18 Sep 2020 10:20:57 -0700 -Subject: [PATCH 1/1] 21 string-op truncation, format truncation, and format - overflow errors - -This isn't a full audit of the source, just addressing anything gcc 10.2 flagged. - -There's two basic mitigations added, depending on the likelyhood and severity -of truncation to correct functioning. - -1) When a truncation is unlikely (copy between two IFNAMSIZ buffers) or -non-critical (output formating) I forced a null-terminiation at the buffer end -after a strncpy to satisfy the compiler. - -2) Where truncation needs proper detection and handling, I used snprintf and -corrected the error checking. - -Signed-off-by: Chris Leech ---- - fcoeadm.c | 8 +++--- - fcoeadm_display.c | 62 ++++++++++++++++++++++++++++++++++------------- - fcoemon.c | 44 ++++++++++++++++++++++++++------- - fipvlan.c | 5 +++- - lib/fcoe_utils.c | 17 ++++++------- - lib/sysfs_hba.c | 6 +++++ - libopenfcoe.c | 4 ++- - 7 files changed, 106 insertions(+), 40 deletions(-) - -diff --git a/fcoeadm.c b/fcoeadm.c -index 776b4e32b2e..8b9112d63c3 100644 ---- a/fcoeadm.c -+++ b/fcoeadm.c -@@ -185,9 +185,10 @@ fcoeadm_action(enum clif_action cmd, char *ifname, enum clif_flags flags) - struct clif_sock_info clif_info; - int rc; - -- if (ifname) -- strncpy(data.ifname, ifname, sizeof(data.ifname)); -- else -+ if (ifname) { -+ strncpy(data.ifname, ifname, IFNAMSIZ); -+ data.ifname[IFNAMSIZ - 1] = '\0'; -+ } else - data.ifname[0] = '\0'; - data.cmd = cmd; - data.flags = flags; -@@ -232,6 +233,7 @@ int main(int argc, char *argv[]) - * expects progname to be valid. - */ - strncpy(progname, basename(argv[0]), sizeof(progname)); -+ progname[sizeof(progname) - 1] = '\0'; - - /* check if we have sysfs */ - if (fcoe_checkdir(SYSFS_MOUNT)) { -diff --git a/fcoeadm_display.c b/fcoeadm_display.c -index 7d29422e91f..4b1d358d1c8 100644 ---- a/fcoeadm_display.c -+++ b/fcoeadm_display.c -@@ -188,6 +188,7 @@ static void sa_dir_crawl(char *dir_name, - struct dirent *dp; - void (*f)(char *dirname, enum disp_style style); - char path[1024]; -+ int rc; - - f = func; - -@@ -199,8 +200,9 @@ static void sa_dir_crawl(char *dir_name, - if (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || - (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))) - continue; -- snprintf(path, sizeof(path), "%s/%s", dir_name, dp->d_name); -- -+ rc = snprintf(path, sizeof(path), "%s/%s", dir_name, dp->d_name); -+ if (rc < 0 || (size_t) rc >= sizeof(path)) -+ continue; - f(path, style); - } - closedir(dir); -@@ -254,10 +256,13 @@ static void show_full_lun_info(unsigned int hba, unsigned int port, - struct dirent *dp; - struct port_attributes *rport_attrs; - struct port_attributes *port_attrs; -+ int rc; - -- snprintf(path, sizeof(path), -- "/sys/class/scsi_device/%u:%u:%u:%u", -- hba, port, tgt, lun); -+ rc = snprintf(path, sizeof(path), -+ "/sys/class/scsi_device/%u:%u:%u:%u", -+ hba, port, tgt, lun); -+ if (rc < 0 || (size_t) rc >= sizeof(path)) -+ return; - - rport_attrs = get_rport_attribs_by_device(path); - if (!rport_attrs) -@@ -287,10 +292,14 @@ static void show_full_lun_info(unsigned int hba, unsigned int port, - - osname = dp->d_name; - -- snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ if (rc < 0 || (size_t) rc >= sizeof(npath)) -+ continue; - sa_sys_read_u64(npath, "size", &lba); - -- snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ if (rc < 0 || (size_t) rc >= sizeof(npath)) -+ continue; - sa_sys_read_u32(npath, "hw_sector_size", &blksize); - } - -@@ -340,10 +349,13 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, - char *capstr = "Unknown"; - char *osname = "Unknown"; - uint64_t size; -+ int rc; - -- snprintf(path, sizeof(path), -- "/sys/class/scsi_device/%u:%u:%u:%u/device/", -- hba, port, tgt, lun); -+ rc = snprintf(path, sizeof(path), -+ "/sys/class/scsi_device/%u:%u:%u:%u/device/", -+ hba, port, tgt, lun); -+ if (rc < 0 || (size_t) rc >= sizeof(path)) -+ return; - - sa_sys_read_line(path, "rev", rev, sizeof(rev)); - sa_sys_read_line(path, "model", model, sizeof(model)); -@@ -363,10 +375,14 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, - - osname = dp->d_name; - -- snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ if (rc < 0 || (size_t) rc >= sizeof(npath)) -+ continue; - sa_sys_read_u64(npath, "size", &size); - -- snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ if (rc < 0 || (size_t) rc >= sizeof(npath)) -+ continue; - sa_sys_read_u32(npath, "hw_sector_size", &blksize); - } - -@@ -419,8 +435,11 @@ static void list_luns_by_rport(char *rport, enum disp_style style) - char *substr; - int len; - int ret; -+ int rc; - -- snprintf(path, sizeof(path), "/sys/class/fc_remote_ports/%s", rport); -+ rc = snprintf(path, sizeof(path), "/sys/class/fc_remote_ports/%s", rport); -+ if (rc < 0 || (size_t) rc >= sizeof(path)) -+ return; - - ret = readlink(path, link, sizeof(link)); - if (ret == -1) -@@ -430,7 +449,9 @@ static void list_luns_by_rport(char *rport, enum disp_style style) - link[ret] = '\0'; - - substr = strstr(link, "net"); -- snprintf(path, sizeof(path), "/sys/class/%s", substr); -+ rc = snprintf(path, sizeof(path), "/sys/class/%s", substr); -+ if (rc < 0 || (size_t) rc >= sizeof(path)) -+ return; - - substr = strstr(path, "fc_remote_ports"); - -@@ -560,11 +581,16 @@ static int get_host_from_vport(struct dirent *dp, - static int crawl_vports(struct dirent *dp, void *arg) - { - char *oldpath = arg; -+ int rc; - - if (!strncmp(dp->d_name, "vport", strlen("vport"))) { - char path[1024]; - -- snprintf(path, sizeof(path), "%s/%s", oldpath, dp->d_name); -+ rc = snprintf(path, sizeof(path), "%s/%s", oldpath, dp->d_name); -+ if (rc < 0 || (size_t) rc >= sizeof(path)) { -+ // ignore error and continue -+ return 0; -+ } - sa_dir_read(path, get_host_from_vport, NULL); - } - return 0; -@@ -573,10 +599,12 @@ static int crawl_vports(struct dirent *dp, void *arg) - static void show_host_vports(const char *host) - { - char path[1024]; -+ int rc; - -- snprintf(path, sizeof(path), "%s/%s/device/", SYSFS_HOST_DIR, host); -+ rc = snprintf(path, sizeof(path), "%s/%s/device/", SYSFS_HOST_DIR, host); -+ if (rc < 0 || (size_t) rc >= sizeof(path)) -+ return; - sa_dir_read(path, crawl_vports, path); -- - } - - static enum fcoe_status display_one_adapter_info(char *ifname) -diff --git a/fcoemon.c b/fcoemon.c -index 60dbc1e444d..8c08bc5a032 100644 ---- a/fcoemon.c -+++ b/fcoemon.c -@@ -518,6 +518,7 @@ static int fcm_read_config_files(void) - } - strncpy(file, CONFIG_DIR "/", sizeof(file)); - strncat(file, dp->d_name, sizeof(file) - strlen(file)); -+ file[sizeof(file) - 1] = '\0'; - fp = fopen(file, "r"); - if (!fp) { - FCM_LOG_ERR(errno, "Failed to read %s\n", file); -@@ -939,6 +940,7 @@ static struct fcoe_port *fcm_new_vlan(int ifindex, int vid, bool vn2vn) - [false] = CLIF_FLAGS_FABRIC, - [true] = CLIF_FLAGS_VN2VN, - }; -+ int rc; - - if (vn2vn) - FCM_LOG_DBG("Auto VLAN found vn2vn on VID %d\n", vid); -@@ -947,8 +949,15 @@ static struct fcoe_port *fcm_new_vlan(int ifindex, int vid, bool vn2vn) - - if (rtnl_find_vlan(ifindex, vid, vlan_name)) { - rtnl_get_linkname(ifindex, real_name); -- snprintf(vlan_name, sizeof(vlan_name), FCOE_VLAN_FORMAT, -- real_name, vid); -+ rc = snprintf(vlan_name, sizeof(vlan_name), FCOE_VLAN_FORMAT, -+ real_name, vid); -+ if (rc < 0 || (size_t) rc >= sizeof(vlan_name)) { -+ FCM_LOG("Warning: Generating FCoE VLAN device name for" -+ "interface %s VLAN %d: format resulted in a" -+ "name larger than IFNAMSIZ\n", real_name, vid); -+ vlan_name[sizeof(vlan_name) - 1] = 0; -+ FCM_LOG("\tTruncating VLAN name to %s\n", vlan_name); -+ } - vlan_create(ifindex, vid, vlan_name); - } - rtnl_set_iff_up(0, vlan_name); -@@ -1077,6 +1086,7 @@ static void fcm_vlan_dev_real_dev(char *vlan_ifname, char *real_ifname) - { - int fd; - struct vlan_ioctl_args ifv; -+ int rc; - - real_ifname[0] = '\0'; - -@@ -1093,9 +1103,18 @@ static void fcm_vlan_dev_real_dev(char *vlan_ifname, char *real_ifname) - FCM_LOG_ERR(ENOSPC, "no room for vlan ifname"); - goto close_fd; - } -- strncpy(ifv.device1, vlan_ifname, sizeof(ifv.device1)); -- if (ioctl(fd, SIOCGIFVLAN, &ifv) == 0) -- strncpy(real_ifname, ifv.u.device2, IFNAMSIZ-1); -+ -+ rc = snprintf(ifv.device1, IFNAMSIZ, "%s", vlan_ifname); -+ if (rc < 0 || rc >= IFNAMSIZ) -+ goto close_fd; -+ -+ if (ioctl(fd, SIOCGIFVLAN, &ifv) == 0) { -+ rc = snprintf(real_ifname, IFNAMSIZ, "%s", ifv.u.device2); -+ if (rc < 0 || rc >= IFNAMSIZ) { -+ real_ifname[0] = '\0'; -+ goto close_fd; -+ } -+ } - close_fd: - close(fd); - } -@@ -1647,8 +1666,10 @@ static void fcm_process_link_msg(struct ifinfomsg *ip, int len, unsigned type) - /* try to find the real device name */ - real_dev[0] = '\0'; - fcm_vlan_dev_real_dev(ifname, real_dev); -- if (strlen(real_dev)) -- strncpy(p->real_ifname, real_dev, IFNAMSIZ-1); -+ if (strlen(real_dev)) { -+ strncpy(p->real_ifname, real_dev, IFNAMSIZ); -+ p->real_ifname[IFNAMSIZ - 1] = '\0'; -+ } - if (p->ready) - update_fcoe_port_state(p, type, operstate, - FCP_CFG_IFNAME); -@@ -1660,7 +1681,8 @@ static void fcm_process_link_msg(struct ifinfomsg *ip, int len, unsigned type) - if (p) { - p->ifindex = ifindex; - memcpy(p->mac, mac, ETHER_ADDR_LEN); -- strncpy(p->real_ifname, ifname, IFNAMSIZ-1); -+ strncpy(p->real_ifname, ifname, IFNAMSIZ); -+ p->real_ifname[IFNAMSIZ - 1] = '\0'; - update_fcoe_port_state(p, type, operstate, - FCP_REAL_IFNAME); - } -@@ -1788,7 +1810,9 @@ static void fcm_process_ieee_msg(struct nlmsghdr *nlh) - if (rta_parent->rta_type != DCB_ATTR_IFNAME) - return; - -- strncpy(ifname, NLA_DATA(rta_parent), sizeof(ifname)); -+ strncpy(ifname, NLA_DATA(rta_parent), IFNAMSIZ); -+ ifname[IFNAMSIZ - 1] = '\0'; -+ - ff = fcm_netif_lookup_create(ifname); - if (!ff) { - FCM_LOG("Processing IEEE message: %s not found or created\n", -@@ -3699,6 +3723,8 @@ int main(int argc, char **argv) - memset(&fcoe_config, 0, sizeof(fcoe_config)); - - strncpy(progname, basename(argv[0]), sizeof(progname)); -+ progname[sizeof(progname) - 1] = '\0'; -+ - sa_log_prefix = progname; - sa_log_flags = 0; - openlog(sa_log_prefix, LOG_CONS, LOG_DAEMON); -diff --git a/fipvlan.c b/fipvlan.c -index 2e9a8f2b047..c8a07339314 100644 ---- a/fipvlan.c -+++ b/fipvlan.c -@@ -449,6 +449,7 @@ static void rtnl_recv_newlink(struct nlmsghdr *nh) - iff->iflink = iff->ifindex; - memcpy(iff->mac_addr, RTA_DATA(ifla[IFLA_ADDRESS]), ETHER_ADDR_LEN); - strncpy(iff->ifname, RTA_DATA(ifla[IFLA_IFNAME]), IFNAMSIZ); -+ iff->ifname[IFNAMSIZ - 1] = '\0'; - - if (ifla[IFLA_LINKINFO]) { - parse_linkinfo(linkinfo, ifla[IFLA_LINKINFO]); -@@ -541,8 +542,10 @@ static void parse_cmdline(int argc, char **argv) - config.start = true; - break; - case 'f': -- if (optarg && strlen(optarg)) -+ if (optarg && strlen(optarg)) { - strncpy(config.suffix, optarg, 256); -+ config.suffix[256 - 1] = '\0'; -+ } - break; - case 'l': - config.link_retry = strtoul(optarg, NULL, 10); -diff --git a/lib/fcoe_utils.c b/lib/fcoe_utils.c -index 516eac5247d..4d13dd7ecf9 100644 ---- a/lib/fcoe_utils.c -+++ b/lib/fcoe_utils.c -@@ -68,9 +68,10 @@ static int fcoe_check_fchost(const char *ifname, const char *dname) - - enum fcoe_status fcoe_find_fchost(const char *ifname, char *fchost, int len) - { -- int n, dname_len, status; -+ int n, status; - struct dirent **namelist; - int rc = ENOFCOECONN; -+ int rrc; - - status = n = scandir(SYSFS_FCHOST, &namelist, 0, alphasort); - -@@ -78,19 +79,17 @@ enum fcoe_status fcoe_find_fchost(const char *ifname, char *fchost, int len) - if (rc) { - /* check symbolic name */ - if (!fcoe_check_fchost(ifname, namelist[n]->d_name)) { -- dname_len = strnlen(namelist[n]->d_name, len); -- -- if (len > dname_len) { -- strncpy(fchost, namelist[n]->d_name, -- dname_len + 1); -- /* rc = 0 indicates found */ -- rc = SUCCESS; -- } else { -+ rrc = snprintf(fchost, len, "%s", namelist[n]->d_name); -+ if (rrc < 0 || rrc >= len) { -+ fchost[0] = '\0'; - /* - * The fc_host is too large - * for the buffer. - */ - rc = EINTERR; -+ } else { -+ /* rc = 0 indicates found */ -+ rc = SUCCESS; - } - } - } -diff --git a/lib/sysfs_hba.c b/lib/sysfs_hba.c -index ce781e2e0ed..a8d557e92b5 100644 ---- a/lib/sysfs_hba.c -+++ b/lib/sysfs_hba.c -@@ -215,6 +215,7 @@ static void get_pci_device_info(struct pci_device *dev, struct hba_info *info) - vname = unknown; - - strncpy(info->manufacturer, vname, sizeof(info->manufacturer)); -+ info->manufacturer[sizeof(info->manufacturer) - 1] = '\0'; - - dname = pci_device_get_device_name(dev); - if (!dname) -@@ -222,6 +223,7 @@ static void get_pci_device_info(struct pci_device *dev, struct hba_info *info) - - strncpy(info->model_description, dname, - sizeof(info->model_description)); -+ info->model_description[sizeof(info->model_description) - 1] = '\0'; - - pci_device_cfg_read_u8(dev, &revision, PCI_REVISION_ID); - snprintf(info->hardware_version, sizeof(info->hardware_version), -@@ -259,6 +261,7 @@ static void get_module_info(const char *pcidev, struct hba_info *info) - strncpy(info->driver_name, - strstr(buf, "module") + strlen("module") + 1, - sizeof(info->driver_name)); -+ info->driver_name[sizeof(info->driver_name) - 1] = '\0'; - - } - -@@ -316,6 +319,8 @@ struct port_attributes *get_rport_attribs(const char *rport) - goto free_path; - - strncpy(pa->device_name, rport, sizeof(pa->device_name)); -+ pa->device_name[sizeof(pa->device_name) - 1] = '\0'; -+ - sa_sys_read_line(path, "node_name", pa->node_name, - sizeof(pa->node_name)); - sa_sys_read_line(path, "port_name", pa->port_name, -@@ -391,6 +396,7 @@ struct port_attributes *get_port_attribs(const char *host) - goto free_path; - - strncpy(pa->device_name, host, sizeof(pa->device_name)); -+ pa->device_name[sizeof(pa->device_name) - 1] = '\0'; - - sa_sys_read_line(path, "symbolic_name", pa->symbolic_name, - sizeof(pa->symbolic_name)); -diff --git a/libopenfcoe.c b/libopenfcoe.c -index c3fd1b031f8..452ee803e63 100644 ---- a/libopenfcoe.c -+++ b/libopenfcoe.c -@@ -207,7 +207,9 @@ static int read_fcoe_ctlr_device(struct dirent *dp, void *arg) - if (!rc) - goto fail; - -- sprintf(hpath, "%s/%s/", SYSFS_FCHOST, fchost); -+ rc = snprintf(hpath, MAX_STR_LEN, "%s/%s/", SYSFS_FCHOST, fchost); -+ if (rc < 0 || rc >= MAX_STR_LEN) -+ goto fail; - - rc = sa_sys_read_line(hpath, "symbolic_name", buf, sizeof(buf)); - --- -2.18.1 - diff --git a/0002-use-of-uninitialized-values-detected-during-LTO.patch b/0002-use-of-uninitialized-values-detected-during-LTO.patch deleted file mode 100644 index ae04024..0000000 --- a/0002-use-of-uninitialized-values-detected-during-LTO.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 64254aee4509192831b9f9cf695abd81a9656f00 Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Mon, 21 Sep 2020 09:33:23 -0700 -Subject: [PATCH 2/2] use of uninitialized values detected during LTO - -lto-wrapper build errors - -Signed-off-by: Chris Leech ---- - fcoeadm_display.c | 2 +- - lib/sysfs_hba.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/fcoeadm_display.c b/fcoeadm_display.c -index 4b1d358d1c8..585ecfae54e 100644 ---- a/fcoeadm_display.c -+++ b/fcoeadm_display.c -@@ -348,7 +348,7 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, - uint32_t blksize = 0; - char *capstr = "Unknown"; - char *osname = "Unknown"; -- uint64_t size; -+ uint64_t size = 0; - int rc; - - rc = snprintf(path, sizeof(path), -diff --git a/lib/sysfs_hba.c b/lib/sysfs_hba.c -index a8d557e92b5..381f335d7ea 100644 ---- a/lib/sysfs_hba.c -+++ b/lib/sysfs_hba.c -@@ -528,7 +528,7 @@ char *get_host_by_fcid(uint32_t fcid) - DIR *dir; - char *host = NULL; - char path[1024]; -- uint32_t port_id; -+ uint32_t port_id = 0; - - dir = opendir(SYSFS_HOST_DIR); - if (!dir) -@@ -562,7 +562,7 @@ char *get_rport_by_fcid(uint32_t fcid) - DIR *dir; - char *rport = NULL; - char path[1024]; -- uint32_t port_id; -+ uint32_t port_id = 0; - - dir = opendir(SYSFS_RPORT_DIR); - if (!dir) --- -2.18.1 - diff --git a/fcoe-utils-gcc7-fmt-truc-err.patch b/fcoe-utils-gcc7-fmt-truc-err.patch deleted file mode 100644 index 3de42b4..0000000 --- a/fcoe-utils-gcc7-fmt-truc-err.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/fipvlan.c b/fipvlan.c -index 7c00c7c..065b742 100644 ---- a/fipvlan.c -+++ b/fipvlan.c -@@ -621,8 +621,10 @@ create_and_start_vlan(struct fcf *fcf, bool vn2vn) - real_dev->ifname, fcf->vlan, vlan->ifname); - rc = 0; - } else { -- snprintf(vlan_name, IFNAMSIZ, "%s.%d%s", -- real_dev->ifname, fcf->vlan, config.suffix); -+ rc = snprintf(vlan_name, IFNAMSIZ, "%s.%d%s", -+ real_dev->ifname, fcf->vlan, config.suffix); -+ if (rc >= IFNAMSIZ) -+ return -E2BIG; - rc = vlan_create(fcf->ifindex, fcf->vlan, vlan_name); - if (rc < 0) - printf("Failed to create VLAN device %s\n\t%s\n", -diff --git a/libopenfcoe.c b/libopenfcoe.c -index 07090d5..98fb975 100644 ---- a/libopenfcoe.c -+++ b/libopenfcoe.c -@@ -59,6 +59,7 @@ static int add_fcoe_fcf_device(struct dirent *dp, void *arg) - { - struct fcoe_ctlr_device *ctlr = (struct fcoe_ctlr_device *)arg; - struct fcoe_fcf_device *fcf; -+ int rc; - - if (!strstr(dp->d_name, "fcf") || - (!strcmp(dp->d_name, "fcf_dev_loss_tmo"))) -@@ -71,8 +72,10 @@ static int add_fcoe_fcf_device(struct dirent *dp, void *arg) - memset(fcf, 0, sizeof(struct fcoe_fcf_device)); - - /* Save the path */ -- snprintf(fcf->path, sizeof(fcf->path), -- "%s/%s", ctlr->path, dp->d_name); -+ rc = snprintf(fcf->path, sizeof(fcf->path), -+ "%s/%s", ctlr->path, dp->d_name); -+ if (rc >= sizeof(fcf->path)) -+ goto fail; - - /* Use the index from the logical enumeration */ - fcf->index = atoi(dp->d_name + sizeof("fcf_") - 1); -@@ -198,7 +201,9 @@ static int read_fcoe_ctlr_device(struct dirent *dp, void *arg) - sa_sys_read_line(ctlr->path, "mode", buf, sizeof(buf)); - sa_enum_encode(fip_conn_type_table, buf, &ctlr->mode); - -- snprintf(lesb_path, sizeof(lesb_path), "%s/lesb/", ctlr->path); -+ rc = snprintf(lesb_path, sizeof(lesb_path), "%s/lesb/", ctlr->path); -+ if (rc >= sizeof(lesb_path)) -+ goto fail; - - /* Get LESB statistics */ - sa_sys_read_u32(lesb_path, "link_fail", diff --git a/fcoe-utils-gcc8-fmt-truc-err.patch b/fcoe-utils-gcc8-fmt-truc-err.patch deleted file mode 100644 index d7602b0..0000000 --- a/fcoe-utils-gcc8-fmt-truc-err.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Chris Leech -Subject: fix build warnings/errors with GCC format-truncation checks - -diff --git a/fcoeadm_display.c b/fcoeadm_display.c -index 120c6084b7ca..f10cfb53d454 100644 ---- a/fcoeadm_display.c -+++ b/fcoeadm_display.c -@@ -254,6 +254,7 @@ static void show_full_lun_info(unsigned int hba, unsigned int port, - struct dirent *dp; - struct port_attributes *rport_attrs; - struct port_attributes *port_attrs; -+ int rc; - - snprintf(path, sizeof(path), - "/sys/class/scsi_device/%u:%u:%u:%u", -@@ -287,10 +288,18 @@ static void show_full_lun_info(unsigned int hba, unsigned int port, - - osname = dp->d_name; - -- snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ if (rc < 0 || rc >= sizeof(npath)) { -+ /* error or truncation, bailing out */ -+ return; -+ } - sa_sys_read_u64(npath, "size", &lba); - -- snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ if (rc < 0 || rc >= sizeof(npath)) { -+ /* error or truncation, bailing out */ -+ return; -+ } - sa_sys_read_u32(npath, "hw_sector_size", &blksize); - } - -@@ -340,6 +349,7 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, - char *capstr = "Unknown"; - char *osname = "Unknown"; - uint64_t size; -+ int rc; - - snprintf(path, sizeof(path), - "/sys/class/scsi_device/%u:%u:%u:%u/device/", -@@ -363,10 +373,18 @@ static void show_short_lun_info(unsigned int hba, unsigned int port, - - osname = dp->d_name; - -- snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/", path, osname); -+ if (rc < 0 || rc >= sizeof(npath)) { -+ /* error or truncation, bailing out */ -+ return; -+ } - sa_sys_read_u64(npath, "size", &size); - -- snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ rc = snprintf(npath, sizeof(npath), "%s/%s/queue/", path, osname); -+ if (rc < 0 || rc >= sizeof(npath)) { -+ /* error or truncation, bailing out */ -+ return; -+ } - sa_sys_read_u32(npath, "hw_sector_size", &blksize); - } - -diff --git a/fcoemon.c b/fcoemon.c -index 9a400c56b72a..bf73a0d4c89e 100644 ---- a/fcoemon.c -+++ b/fcoemon.c -@@ -939,6 +939,7 @@ static struct fcoe_port *fcm_new_vlan(int ifindex, int vid, bool vn2vn) - [false] = CLIF_FLAGS_FABRIC, - [true] = CLIF_FLAGS_VN2VN, - }; -+ int rc; - - if (vn2vn) - FCM_LOG_DBG("Auto VLAN found vn2vn on VID %d\n", vid); -@@ -947,8 +948,15 @@ static struct fcoe_port *fcm_new_vlan(int ifindex, int vid, bool vn2vn) - - if (rtnl_find_vlan(ifindex, vid, vlan_name)) { - rtnl_get_linkname(ifindex, real_name); -- snprintf(vlan_name, sizeof(vlan_name), FCOE_VLAN_FORMAT, -- real_name, vid); -+ rc = snprintf(vlan_name, sizeof(vlan_name), FCOE_VLAN_FORMAT, -+ real_name, vid); -+ if (rc >= sizeof(vlan_name)) { -+ FCM_LOG("Warning: Generating FCoE VLAN device name for" -+ "interface %s VLAN %d: format resulted in a" -+ "name larger than IFNAMSIZ\n", real_name, vid); -+ vlan_name[sizeof(vlan_name) - 1] = 0; -+ FCM_LOG("\tTruncating VLAN name to %s\n", vlan_name); -+ } - vlan_create(ifindex, vid, vlan_name); - } - rtnl_set_iff_up(0, vlan_name); -@@ -3549,7 +3557,7 @@ static void fcm_srv_receive(void *arg) - } - - cmd = data->cmd; -- strncpy(ifname, data->ifname, sizeof(data->ifname)); -+ strncpy(ifname, data->ifname, sizeof(ifname) - 1); - ifname[sizeof(data->ifname)] = 0; - - if (cmd != CLIF_PID_CMD) { -diff --git a/libopenfcoe.c b/libopenfcoe.c -index 07090d5a09aa..c1190adc2328 100644 ---- a/libopenfcoe.c -+++ b/libopenfcoe.c -@@ -179,7 +179,9 @@ static int read_fcoe_ctlr_device(struct dirent *dp, void *arg) - if (!rc) - goto fail; - -- sprintf(hpath, "%s/%s/", SYSFS_FCHOST, fchost); -+ rc = snprintf(hpath, MAX_STR_LEN, "%s/%s/", SYSFS_FCHOST, fchost); -+ if (rc < 0 || rc >= MAX_STR_LEN) -+ goto fail; - - rc = sa_sys_read_line(hpath, "symbolic_name", buf, sizeof(buf)); - diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 43fbafd..4418065 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,32 +1,26 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags %global _hardened_build 1 -# v1.0.33-6-gfe376de5343 -%global commit0 fe376de5343c58f108a14e67819626424054591b +# v1.0.33-9-g848bcc6ba8c +%global commit0 848bcc6ba8cda1f344663b4e73f1bc4857bcb4e3 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: fcoe-utils Version: 1.0.33 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org Source0: https://github.com/openSUSE/fcoe-utils/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tar.gz -Source1: quickstart.txt -Source2: fcoe.service -Source3: fcoe.config ExcludeArch: ppc s390 -Patch1: 0001-21-string-op-truncation-format-truncation-and-format.patch -Patch2: 0002-use-of-uninitialized-values-detected-during-LTO.patch Patch3: %{name}-gcc11.patch BuildRequires: autoconf BuildRequires: automake -BuildRequires: libpciaccess-devel BuildRequires: libtool +BuildRequires: libpciaccess-devel BuildRequires: lldpad-devel >= 0.9.43 BuildRequires: systemd -BuildRequires: libbsd-devel -BuildRequires: make +BuildRequires: make Requires: lldpad >= 0.9.43 Requires: iproute Requires: device-mapper-multipath @@ -41,50 +35,47 @@ fcoemon - service to configure DCB Ethernet QOS filters, works with lldpad %prep %autosetup -p1 -n fcoe-utils-%{commit0} -cp -v %{SOURCE1} quickstart.txt %build ./bootstrap.sh -%configure +%configure --with-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} rm -rf %{buildroot}/etc/init.d -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig %{buildroot}%{_unitdir} -rm -f %{buildroot}%{_unitdir}/* -install -m 644 %{SOURCE2} %{buildroot}%{_unitdir} -install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/fcoe mkdir -p %{buildroot}%{_libexecdir}/fcoe for file in \ contrib/*.sh \ debug/*sh do install -m 755 ${file} %{buildroot}%{_libexecdir}/fcoe/ done -# We supply our own config for fcoe.service -rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %post -%systemd_post fcoe.service +%systemd_post fcoe.service fcoemon.socket %preun -%systemd_preun fcoe.service +%systemd_preun fcoe.service fcoemon.socket %postun -%systemd_postun_with_restart fcoe.service +%systemd_postun_with_restart fcoe.service fcoemon.socket %files -%doc README COPYING QUICKSTART quickstart.txt +%doc README COPYING QUICKSTART %{_sbindir}/* %{_mandir}/man8/* %{_unitdir}/fcoe.service +%{_unitdir}/fcoemon.socket %{_sysconfdir}/fcoe/ %config(noreplace) %{_sysconfdir}/fcoe/cfg-ethx -%config(noreplace) %{_sysconfdir}/sysconfig/fcoe +%config(noreplace) %{_sysconfdir}/fcoe/config %{_datadir}/bash-completion/completions/* %{_libexecdir}/fcoe/ %changelog +* Mon Feb 01 2021 Chris Leech - 1.0.33-4.git848bcc6 +- drop any differences with upstream service and config files + * Tue Jan 26 2021 Fedora Release Engineering - 1.0.33-3.gitfe376de - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/fcoe.config b/fcoe.config deleted file mode 100644 index 2166c39..0000000 --- a/fcoe.config +++ /dev/null @@ -1,5 +0,0 @@ -# All supported drivers listed here are loaded when service starts -SUPPORTED_DRIVERS="libfc fcoe bnx2fc" - -# Add --debug to enable debug messages -FCOEMON_OPTS="--syslog" diff --git a/fcoe.service b/fcoe.service deleted file mode 100644 index 8c438c7..0000000 --- a/fcoe.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Open-FCoE Inititator. -After=syslog.target network.target lldpad.service - -[Service] -Type=forking -EnvironmentFile=/etc/sysconfig/fcoe -ExecStartPre=/sbin/modprobe -qa $SUPPORTED_DRIVERS -ExecStart=/usr/sbin/fcoemon $FCOEMON_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/quickstart.txt b/quickstart.txt deleted file mode 100644 index fdb6e3f..0000000 --- a/quickstart.txt +++ /dev/null @@ -1,25 +0,0 @@ -Quick Start guide for Open-FCoE -=============================== - -1. Install fcoe-utils package. This should also install dcbd, libhbaapi and - libhbalinux as dependencies. - -2. Rename /etc/fcoe/cfg-ethx so it corresponds with name of your network - interface (e.g. /etc/fcoe/cfg-eth0). Copy and rename this file accordingly - if you have more interfaces, which should be fcoe-enabled - -3. Modify configuration files to enable FCoE. Set FCOE_ENABLE="yes" and - DCB_REQUIRED="yes". - -3. Run 'systemctl enable fcoe.service' to start FCoE per run level. This - will setup FCoE to start on reboot. - -4. Run 'systemctl enable lldpad.service' to start LLDP agent per run - level. This will setup DCB to start on reboot. - -5. Run 'systemctl start lldpad.service' to start LLDP agent. - -6. Run 'dcbtool sc ethX dcb on; dcbtool sc ethX app:0 e:1;' for each fcoe-enabled - interface to setup DCB for FCoE. - -7. Run 'systemctl start fcoe.sertvice' to start FCoE. diff --git a/sources b/sources index 1dc9485..5f6df35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fcoe-utils-1.0.33-fe376de.tar.gz) = 76f4225b6a235f955fd39499987d5dfef0dfd5d00fe603770b3ff162348b962d2c11b8b567a389314ca8284f110e155fe5e31b78511ad129a636c88ed25d4f3d +SHA512 (fcoe-utils-1.0.33-848bcc6.tar.gz) = 1f591d4b950032f015399a56233510146791d6c0ac510c1c384ce430273445f4be94aaaeb144469b856830401f2089bb951ec3ee253b425ec9e02fbd8d639bda From 957367e7d7102e9f7257ff1535854faddc86ba89 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Tue, 2 Feb 2021 11:22:15 -0800 Subject: [PATCH 12/30] add in RHEL conditional for removed fcoe.ko support --- fcoe-utils.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 4418065..e4f2469 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.33 -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -35,6 +35,12 @@ fcoemon - service to configure DCB Ethernet QOS filters, works with lldpad %prep %autosetup -p1 -n fcoe-utils-%{commit0} +%if 0%{?rhel} >= 8 +# RHEL dropped support for software fcoe (fcoe.ko) +sed -i 's/^\(SUPPORTED_DRIVERS\)=".*"$/\1="bnx2fc qedf"/' etc/config +# make the defaults sane for supported offload drivers +sed -i 's/^\(DCB_REQUIRED\)=".*"$/\1="no"/' etc/cfg-ethx +%endif %build ./bootstrap.sh @@ -73,6 +79,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Tue Feb 02 2021 Chris Leech - 1.0.33-5.git848bcc6 +- add in RHEL conditional for removed fcoe.ko support + * Mon Feb 01 2021 Chris Leech - 1.0.33-4.git848bcc6 - drop any differences with upstream service and config files From 40a726740a94b58ff58544926aae4193ee2152da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:49 +0100 Subject: [PATCH 13/30] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- fcoe-utils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index e4f2469..7c7e73f 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.33 -Release: 5.git%{shortcommit0}%{?dist} +Release: 6.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -79,6 +79,10 @@ done %{_libexecdir}/fcoe/ %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.33-6.git848bcc6 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Feb 02 2021 Chris Leech - 1.0.33-5.git848bcc6 - add in RHEL conditional for removed fcoe.ko support From 278397fbf463964d3f1398f9d699a3d0462191b3 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Wed, 14 Apr 2021 11:10:12 -0700 Subject: [PATCH 14/30] upstream 1.0.34 drop gcc11 warning disabling patch, warnings have been addressed upstream --- fcoe-utils-gcc11.patch | 28 ---------------------------- fcoe-utils.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 fcoe-utils-gcc11.patch diff --git a/fcoe-utils-gcc11.patch b/fcoe-utils-gcc11.patch deleted file mode 100644 index 3614194..0000000 --- a/fcoe-utils-gcc11.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 2f323e4..d6bc3c3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,6 +25,10 @@ fcping_CFLAGS = $(AM_CFLAGS) - ## rules for building fipvlan - fipvlan_SOURCES = fipvlan.c - fipvlan_LDADD = lib/libutil.a -+# These look like valid warnings, but the code may be fine in practice. Someone -+# with a deeper understanding of the source needs to chime in -+fipvlan_CFLAGS = $(AM_CFLAGS) -Wno-error=array-bounds -Wno-stringop-overread -+ - - AUTOMAKE_OPTIONS=subdir-objects - noinst_LIBRARIES = lib/libutil.a libopenfcoe.a -diff --git a/Makefile.am b/Makefile.am -index 11262ec..08bc207 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,7 +20,7 @@ fcoemon_CFLAGS = $(AM_CFLAGS) $(DCBD_CFLAGS) - ## rules for building fcping - fcping_SOURCES = fcping.c - fcping_LDADD = lib/libutil.a libopenfcoe.a $(PCIACCESS_LIBS) -lrt --fcping_CFLAGS = $(AM_CFLAGS) -+fcping_CFLAGS = $(AM_CFLAGS) -Wno-error=stringop-overflow - - ## rules for building fipvlan - fipvlan_SOURCES = fipvlan.c diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 7c7e73f..489313b 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,19 +1,18 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags %global _hardened_build 1 -# v1.0.33-9-g848bcc6ba8c -%global commit0 848bcc6ba8cda1f344663b4e73f1bc4857bcb4e3 +# v1.0.34 +%global commit0 14ef0d24c0657e56c68360afcfe64034d37323e0 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: fcoe-utils -Version: 1.0.33 -Release: 6.git%{shortcommit0}%{?dist} +Version: 1.0.34 +Release: 0.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org Source0: https://github.com/openSUSE/fcoe-utils/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tar.gz ExcludeArch: ppc s390 -Patch3: %{name}-gcc11.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -79,6 +78,10 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Apr 14 2021 Chris Leech - 1.0.34-0.git14ef0d2 +- upstream 1.0.34 +- drop gcc11 warning disabling patch, warnings have been addressed upstream + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.33-6.git848bcc6 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index 5f6df35..0a8640e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fcoe-utils-1.0.33-848bcc6.tar.gz) = 1f591d4b950032f015399a56233510146791d6c0ac510c1c384ce430273445f4be94aaaeb144469b856830401f2089bb951ec3ee253b425ec9e02fbd8d639bda +SHA512 (fcoe-utils-1.0.34-14ef0d2.tar.gz) = bc58aa0e60eaae156e4ac8c6cbbca621abb52da8acd685d4839f15727c067b0ee99a483057c33449b87eef034971a98e3cb3ea6d24093d5239dedf27391dabae From ca843ca7f3fbd60d64303557e331712a87190660 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 22:47:26 +0000 Subject: [PATCH 15/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 489313b..0fd242e 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 0.git%{shortcommit0}%{?dist} +Release: 0.git%{shortcommit0}%{?dist}.1 Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -78,6 +78,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.0.34-0.git14ef0d2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Apr 14 2021 Chris Leech - 1.0.34-0.git14ef0d2 - upstream 1.0.34 - drop gcc11 warning disabling patch, warnings have been addressed upstream From 71939a4dad07a85fa0200cfc716abdff867016fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 02:49:40 +0000 Subject: [PATCH 16/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 0fd242e..81f09a6 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 0.git%{shortcommit0}%{?dist}.1 +Release: 0.git%{shortcommit0}%{?dist}.2 Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -78,6 +78,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.0.34-0.git14ef0d2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.0.34-0.git14ef0d2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 5ae4c632c12f8e532e3be9999ee1e985b182581d Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Fri, 28 Jan 2022 11:20:21 -0800 Subject: [PATCH 17/30] FTBFS: update with gcc 12 fix from upstream --- fcoe-utils.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 81f09a6..8ee8b2a 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,13 +1,13 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags %global _hardened_build 1 -# v1.0.34 -%global commit0 14ef0d24c0657e56c68360afcfe64034d37323e0 +# v1.0.34-2 +%global commit0 b233050792cc5fa54ba1da257706ca2b5ef3c987 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: fcoe-utils Version: 1.0.34 -Release: 0.git%{shortcommit0}%{?dist}.2 +Release: 1.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -78,6 +78,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Fri Jan 28 2022 Chris Leech - 1.0.34-1.gitb233050 +- FTBFS: update with gcc 12 fix from upstream + * Thu Jan 20 2022 Fedora Release Engineering - 1.0.34-0.git14ef0d2.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 0a8640e..31e1a11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fcoe-utils-1.0.34-14ef0d2.tar.gz) = bc58aa0e60eaae156e4ac8c6cbbca621abb52da8acd685d4839f15727c067b0ee99a483057c33449b87eef034971a98e3cb3ea6d24093d5239dedf27391dabae +SHA512 (fcoe-utils-1.0.34-b233050.tar.gz) = 8fc7df765fb7a2a17f9d3b9ce67b2499b7f602671d75be663cb7a668b0cbdfe7126796548c16496dac964549c695de844e6599c026a71f3b67d3d5fe6c29f858 From be0b0eb93565d0d525ca73bbb5c31d91b9d19719 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Fri, 4 Feb 2022 09:51:58 -0800 Subject: [PATCH 18/30] FTBFS: more gcc 12 snprintf truncation issues on 32-bit arch --- ...intf-string-precision-modifiers-in-f.patch | 95 +++++++++++++++++++ fcoe-utils.spec | 7 +- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch diff --git a/0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch b/0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch new file mode 100644 index 0000000..1c9e3b3 --- /dev/null +++ b/0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch @@ -0,0 +1,95 @@ +From c54147b3ada8c37a536a4df90e8707538021ed20 Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Fri, 4 Feb 2022 09:21:47 -0800 +Subject: [PATCH 1/1] fcoemon: add snprintf string precision modifiers in + fcm_netif_advance + +GCC 12 is warning of potential snprintf truncations + +fcm_netif.ifname is an IFNAMSIZ array, but formating with %s doesn't +understand that, so add a precision modifier every time we print it to +limit the output. This allows the compiler to verify that the output +buffer is of sufficient length to never truncate. + +Signed-off-by: Chris Leech +--- + fcoemon.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/fcoemon.c b/fcoemon.c +index 8c08bc5a032..b85f276c7df 100644 +--- a/fcoemon.c ++++ b/fcoemon.c +@@ -3135,55 +3135,55 @@ static void fcm_netif_advance(struct fcm_netif *ff) + case FCD_ERROR: + break; + case FCD_GET_DCB_STATE: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_CONFIG, FEATURE_DCB, 0, +- (u_int) strlen(ff->ifname), ff->ifname); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_SEND_CONF: + snprintf(params, sizeof(params), "%x1%x02", + ff->ff_app_info.enable, + ff->ff_app_info.willing); +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_SET_CONFIG, FEATURE_APP, APP_FCOE_STYPE, +- (u_int) strlen(ff->ifname), ff->ifname, params); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, params); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_PFC_CONFIG: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_CONFIG, FEATURE_PFC, 0, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_APP_CONFIG: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_CONFIG, FEATURE_APP, APP_FCOE_STYPE, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_PFC_OPER: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_OPER, FEATURE_PFC, 0, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_APP_OPER: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_OPER, FEATURE_APP, APP_FCOE_STYPE, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_PEER: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_PEER, FEATURE_APP, APP_FCOE_STYPE, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_DONE: +-- +2.34.1 + diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 8ee8b2a..a32d047 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -27,6 +27,8 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Patch1: 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch + %description Fibre Channel over Ethernet utilities fcoeadm - command line tool for configuring FCoE interfaces @@ -78,6 +80,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Fri Feb 04 2022 Chris Leech - 1.0.34-2.gitb233050 +- FTBFS: more gcc 12 snprintf truncation issues on 32-bit arch + * Fri Jan 28 2022 Chris Leech - 1.0.34-1.gitb233050 - FTBFS: update with gcc 12 fix from upstream From 8ba515b514c55d95bca01621febd588c47af90ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 02:57:56 +0000 Subject: [PATCH 19/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index a32d047..ff40692 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -80,6 +80,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.0.34-3.gitb233050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Feb 04 2022 Chris Leech - 1.0.34-2.gitb233050 - FTBFS: more gcc 12 snprintf truncation issues on 32-bit arch From 5d854e7245993ec5b1736997be1431030d26c886 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:14:09 +0000 Subject: [PATCH 20/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index ff40692..0e985d5 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -80,6 +80,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.0.34-4.gitb233050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1.0.34-3.gitb233050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 297dd1dca7fe7bd3f325f3aab6e0e77e037e0bb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 19:27:54 +0000 Subject: [PATCH 21/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 0e985d5..3ea7c16 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -80,6 +80,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.0.34-5.gitb233050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.0.34-4.gitb233050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 028510839f20f11ac7addda937e7bbae8815791c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 12 Jul 2023 20:34:32 -0400 Subject: [PATCH 22/30] Drop i686 build This package fails with a compiler error on i686 only, but there should be no need for an i686 build at this point: https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval --- fcoe-utils.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 3ea7c16..bea6cd6 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -29,6 +29,9 @@ Requires(postun): systemd Patch1: 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + %description Fibre Channel over Ethernet utilities fcoeadm - command line tool for configuring FCoE interfaces From 8f53992b0f469d00871123a8cb020cefd6ce9d4e Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Mon, 30 Oct 2023 13:33:46 -0700 Subject: [PATCH 23/30] use SPDX in license tag --- fcoe-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index bea6cd6..e14e61c 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,9 +7,9 @@ Name: fcoe-utils Version: 1.0.34 -Release: 5.git%{shortcommit0}%{?dist} +Release: 6.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities -License: GPLv2 +License: GPL-2.0-only URL: http://www.open-fcoe.org Source0: https://github.com/openSUSE/fcoe-utils/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tar.gz ExcludeArch: ppc s390 @@ -83,6 +83,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Mon Oct 30 2023 Chris Leech - 1.0.34-6.gitb233050 +- use SPDX in license tag + * Wed Jul 19 2023 Fedora Release Engineering - 1.0.34-5.gitb233050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5ac2d8057f7d62e55315fe8300aa176dd0dd11d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:03:15 +0000 Subject: [PATCH 24/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index e14e61c..59d9771 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 6.git%{shortcommit0}%{?dist} +Release: 7.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -83,6 +83,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.34-7.gitb233050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Oct 30 2023 Chris Leech - 1.0.34-6.gitb233050 - use SPDX in license tag From 106e662e895a3b5edf7bb2158fabc2886b21dd09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:21:49 +0000 Subject: [PATCH 25/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 59d9771..e0ad9a4 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 7.git%{shortcommit0}%{?dist} +Release: 8.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -83,6 +83,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.0.34-8.gitb233050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.0.34-7.gitb233050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3132bf66ab0c821be58f3081df9a73ae27d7c0ee Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 6 Feb 2024 21:23:00 -0500 Subject: [PATCH 26/30] FTBFS: Don't attempt to memcpy() zero bytes Signed-off-by: Stephen Gallagher --- 0002-Don-t-attempt-to-memcpy-zero-bytes.patch | 34 +++++++++++++++++++ fcoe-utils.spec | 8 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0002-Don-t-attempt-to-memcpy-zero-bytes.patch diff --git a/0002-Don-t-attempt-to-memcpy-zero-bytes.patch b/0002-Don-t-attempt-to-memcpy-zero-bytes.patch new file mode 100644 index 0000000..fa45a14 --- /dev/null +++ b/0002-Don-t-attempt-to-memcpy-zero-bytes.patch @@ -0,0 +1,34 @@ +From 78a5e2e17bba531b41101ca036a5bb1a0d5caca5 Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Tue, 6 Feb 2024 21:15:33 -0500 +Subject: [PATCH 2/2] Don't attempt to memcpy() zero bytes + +add_rtattr_nest() is called in several places in the code. As part of +its operation, it calls add_rtattr(nm type, NULL, 0) which results in +NULL and 0 being passed to memcpy(). This fails with -Werror=nonnull +on recent GCC. + +Signed-off-by: Stephen Gallagher +--- + lib/rtnetlink.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/rtnetlink.c b/lib/rtnetlink.c +index 3b8413718997568a20752791807b19c1f299955e..faa60d7c12f68af175d223b6c3c3257a982e4f37 100644 +--- a/lib/rtnetlink.c ++++ b/lib/rtnetlink.c +@@ -172,7 +172,10 @@ static void add_rtattr(struct nlmsghdr *n, int type, const void *data, int alen) + + rta->rta_type = type; + rta->rta_len = len; +- memcpy(RTA_DATA(rta), data, alen); ++ if (alen > 0) ++ { ++ memcpy(RTA_DATA(rta), data, alen); ++ } + n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len); + } + +-- +2.43.0 + diff --git a/fcoe-utils.spec b/fcoe-utils.spec index e0ad9a4..263df66 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 8.git%{shortcommit0}%{?dist} +Release: 9.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -29,6 +29,9 @@ Requires(postun): systemd Patch1: 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch +# https://github.com/openSUSE/fcoe-utils/pull/25 +Patch2: 0002-Don-t-attempt-to-memcpy-zero-bytes.patch + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -83,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Tue Feb 06 2024 Stephen Gallagher - 1.0.34-9.gitb233050 +- FTBFS: Don't attempt to memcpy() zero bytes + * Wed Jan 24 2024 Fedora Release Engineering - 1.0.34-8.gitb233050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 66071c86d6d6f156815160a8d2502023e9d1cb98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 22:55:13 +0000 Subject: [PATCH 27/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 263df66..4c46ba5 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 9.git%{shortcommit0}%{?dist} +Release: 10.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -86,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.0.34-10.gitb233050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 06 2024 Stephen Gallagher - 1.0.34-9.gitb233050 - FTBFS: Don't attempt to memcpy() zero bytes From a5b0bf8780e55b58cab05aec95c6bb68821c7143 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:02:04 +0000 Subject: [PATCH 28/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 4c46ba5..dd01c07 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 10.git%{shortcommit0}%{?dist} +Release: 11.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -86,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.0.34-11.gitb233050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.0.34-10.gitb233050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 03250fc98889f227ae59499b342938d959f0531b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:24:20 +0000 Subject: [PATCH 29/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index dd01c07..e5dc173 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 11.git%{shortcommit0}%{?dist} +Release: 12.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -86,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.0.34-12.gitb233050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1.0.34-11.gitb233050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5f395717891c031fb15e694d9f428cc982815622 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Tue, 6 Jan 2026 16:25:57 -0800 Subject: [PATCH 30/30] FTBFS: GCC 16 -Werror=discarded-qualifiers Signed-off-by: Chris Leech --- ...iscards-const-qualifier-from-pointer.patch | 44 +++++++++++++++++++ fcoe-utils.spec | 7 ++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0003-initialization-discards-const-qualifier-from-pointer.patch diff --git a/0003-initialization-discards-const-qualifier-from-pointer.patch b/0003-initialization-discards-const-qualifier-from-pointer.patch new file mode 100644 index 0000000..39fc30e --- /dev/null +++ b/0003-initialization-discards-const-qualifier-from-pointer.patch @@ -0,0 +1,44 @@ +From dfadd3fd53860a8f44871e479bf602a2fa3bae53 Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Tue, 6 Jan 2026 16:20:49 -0800 +Subject: [PATCH 1/1] =?UTF-8?q?initialization=20discards=20=E2=80=98const?= + =?UTF-8?q?=E2=80=99=20qualifier=20from=20pointer=20target=20type?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Chris Leech +--- + lib/fcoe_utils.c | 2 +- + lib/sysfs_hba.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/fcoe_utils.c b/lib/fcoe_utils.c +index 4d13dd7ecf9..5ea713679a5 100644 +--- a/lib/fcoe_utils.c ++++ b/lib/fcoe_utils.c +@@ -161,7 +161,7 @@ int fcoe_checkdir(char *dir) + */ + char *get_ifname_from_symbolic_name(const char *symbolic_name) + { +- char *last_space = strrchr(symbolic_name, ' '); ++ const char *last_space = strrchr(symbolic_name, ' '); + + if (!last_space || strlen(last_space) == 1) + return NULL; +diff --git a/lib/sysfs_hba.c b/lib/sysfs_hba.c +index 381f335d7ea..302ce634954 100644 +--- a/lib/sysfs_hba.c ++++ b/lib/sysfs_hba.c +@@ -441,7 +441,7 @@ char *get_pci_dev_from_netdev(const char *netdev) + free(path); + if (ret == -1) { + char realdev[256]; +- char *subif; ++ const char *subif; + size_t len; + + subif = strchr(netdev, '.'); +-- +2.52.0 + diff --git a/fcoe-utils.spec b/fcoe-utils.spec index e5dc173..1794653 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 12.git%{shortcommit0}%{?dist} +Release: 13.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -32,6 +32,8 @@ Patch1: 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch # https://github.com/openSUSE/fcoe-utils/pull/25 Patch2: 0002-Don-t-attempt-to-memcpy-zero-bytes.patch +Patch3: 0003-initialization-discards-const-qualifier-from-pointer.patch + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -86,6 +88,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Jan 07 2026 Chris Leech - 1.0.34-13.gitb233050 +- FTBFS: GCC 16 -Werror=discarded-qualifiers + * Wed Jul 23 2025 Fedora Release Engineering - 1.0.34-12.gitb233050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild