From d188efb2e817e621678d6c5a1919745a7cd46591 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Sun, 26 Oct 2014 18:32:39 -0700 Subject: [PATCH 01/49] fix vn2vn mode from fcoeadm --- fcoe-utils-1.0.28-systemd-doc.patch | 25 ----------- fcoe-utils-1.0.29-automake-1.14.patch | 10 ----- ...lags-to-fcoemon-to-enable-vn2vn-mode.patch | 45 +++++++++++++++++++ fcoe-utils.spec | 11 ++++- 4 files changed, 54 insertions(+), 37 deletions(-) delete mode 100644 fcoe-utils-1.0.28-systemd-doc.patch delete mode 100644 fcoe-utils-1.0.29-automake-1.14.patch create mode 100644 fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch diff --git a/fcoe-utils-1.0.28-systemd-doc.patch b/fcoe-utils-1.0.28-systemd-doc.patch deleted file mode 100644 index ada3283..0000000 --- a/fcoe-utils-1.0.28-systemd-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/doc/fcoemon.8 b/doc/fcoemon.8 -index e9a045b..020394e 100644 ---- a/doc/fcoemon.8 -+++ b/doc/fcoemon.8 -@@ -358,7 +358,7 @@ indicates whether a FIP responder should be activated on this device to support - Note that the attached Ethernet peer device (e\&.g\&. FCoE capable switch port) must have compatible settings For DCB and FCoE to function properly\&. - .SS "/etc/init\&.d/fcoe" - .sp --This is the \fBfcoe\fR system service script\&. This script is invoked by the init process or by the service command to start and stop the \fBfcoemon\fR\&. -+This is the \fBfcoe\fR system service script\&. This script is invoked by the init process or by the service command to start and stop the \fBfcoemon\fR\&. On systemd-enabled systems, \fBfcoemon\fR is controlled via the \fBfcoe.service\fR unit. - .SH "VLAN NAMING CONVENTIONS" - .sp - If a new VLAN device is created (see the description of the \fIAUTO_VLAN\fR setting above), it will have the name \fIdev\fR\&.\fIvlan\fR\-fcoe; where \fIdev\fR is the name of the Ethernet parent device and \fIvlan\fR is the discovered VLAN ID number\&. -diff --git a/doc/fcoemon.txt b/doc/fcoemon.txt -index ec15197..09ee5a2 100644 ---- a/doc/fcoemon.txt -+++ b/doc/fcoemon.txt -@@ -214,6 +214,7 @@ must have compatible settings For DCB and FCoE to function properly. - ~~~~~~~~~~~~~~~~ - This is the *fcoe* system service script. This script is invoked by the - init process or by the service command to start and stop the *fcoemon*. -+On systemd-enabled systems, *fcoemon* is controlled via the *fcoe.service* unit. - - VLAN NAMING CONVENTIONS - ----------------------- diff --git a/fcoe-utils-1.0.29-automake-1.14.patch b/fcoe-utils-1.0.29-automake-1.14.patch deleted file mode 100644 index 3f1d035..0000000 --- a/fcoe-utils-1.0.29-automake-1.14.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 73c140f..bb1385b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,4 @@ - AC_INIT([fcoe-utils], [1.0.29], [fcoe-devel@open-fcoe.org]) --AM_INIT_AUTOMAKE([foreign]) - - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - AM_INIT_AUTOMAKE([foreign]) diff --git a/fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch b/fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch new file mode 100644 index 0000000..020b428 --- /dev/null +++ b/fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch @@ -0,0 +1,45 @@ +From 50e1aaa1b8b6856a890ae3f036ae9439b24c40c3 Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Fri, 24 Oct 2014 14:36:53 -0700 +Subject: [PATCH] pass flags to fcoemon to enable vn2vn mode + +--- + fcoeadm.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/fcoeadm.c b/fcoeadm.c +index 07ff690..776b4e3 100644 +--- a/fcoeadm.c ++++ b/fcoeadm.c +@@ -286,7 +286,7 @@ int main(int argc, char *argv[]) + } + + ifname = argv[optind]; +- rc = fcoeadm_action(cmd, ifname, CLIF_FLAGS_NONE); ++ rc = fcoeadm_action(cmd, ifname, flags); + break; + case 'r': + cmd = CLIF_RESET_CMD; +@@ -303,8 +303,7 @@ int main(int argc, char *argv[]) + ifname = argv[optind]; + rc = fcoe_validate_fcoe_conn(ifname); + if (!rc) +- rc = fcoeadm_action(cmd, ifname, +- CLIF_FLAGS_NONE); ++ rc = fcoeadm_action(cmd, ifname, flags); + break; + + case 'i': +@@ -405,8 +404,7 @@ int main(int argc, char *argv[]) + rc = display_port_stats(ifname, stat_interval); + break; + case 'p': +- rc = fcoeadm_action(CLIF_PID_CMD, NULL, +- CLIF_FLAGS_NONE); ++ rc = fcoeadm_action(CLIF_PID_CMD, NULL, flags); + break; + + case 'b': +-- +1.9.3 + diff --git a/fcoe-utils.spec b/fcoe-utils.spec index c6066f3..499d696 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,9 +1,11 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags -%define _hardened_build 1 +%global _hardened_build 1 + +%global checkout 9267509 Name: fcoe-utils Version: 1.0.29 -Release: 6%{?dist} +Release: 7.git%{checkout}%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -15,6 +17,7 @@ Source2: fcoe.service Source3: fcoe.config ExcludeArch: ppc s390 s390x Patch1: fcoe-utils-1.0.29-29-g9267509.patch +Patch2: fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libhbaapi-devel >= 2.2.9-6 @@ -39,6 +42,7 @@ fcoemon - service to configure DCB Ethernet QOS filters, works with lldpad %setup -q cp -v %{SOURCE1} quickstart.txt %patch1 -p1 -b .v1_0_29-29 +%patch2 -p1 -b .vn2vn %build ./bootstrap.sh @@ -82,6 +86,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Fri Oct 24 2014 Chris Leech - 1.0.29-7 +- enable vn2vn mode in fcoeadm + * Tue Oct 07 2014 Chris Leech - 1.0.29-6 - update to upstream v1.0.29-29-g9267509 From 1447cbc1c848ca036a542e11101353a18065fd46 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Tue, 16 Jun 2015 17:24:41 -0700 Subject: [PATCH 02/49] rebase to upstream v1.0.30-2-g91c0c8c --- fcoe-utils.spec | 20 +++++++++++--------- sources | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 499d696..a940ff0 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,11 +1,11 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags %global _hardened_build 1 -%global checkout 9267509 +%global checkout 91c0c8c Name: fcoe-utils -Version: 1.0.29 -Release: 7.git%{checkout}%{?dist} +Version: 1.0.30 +Release: 1.git%{checkout}%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -16,12 +16,13 @@ Source1: quickstart.txt Source2: fcoe.service Source3: fcoe.config ExcludeArch: ppc s390 s390x -Patch1: fcoe-utils-1.0.29-29-g9267509.patch -Patch2: fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch +Patch1: fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch +Patch2: fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch +Patch3: fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libhbaapi-devel >= 2.2.9-6 -BuildRequires: libhbalinux-devel >= 1.0.16-5 +BuildRequires: libhbalinux-devel >= 1.0.17-1 BuildRequires: libtool BuildRequires: lldpad-devel >= 0.9.43 BuildRequires: systemd @@ -39,10 +40,8 @@ fcoeadm - command line tool for configuring FCoE interfaces fcoemon - service to configure DCB Ethernet QOS filters, works with lldpad %prep -%setup -q +%autosetup -p1 cp -v %{SOURCE1} quickstart.txt -%patch1 -p1 -b .v1_0_29-29 -%patch2 -p1 -b .vn2vn %build ./bootstrap.sh @@ -86,6 +85,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Tue Jun 16 2015 Chris Leech - 1.0.30-1 +- rebase to upstream v1.0.30-2-g91c0c8c + * Fri Oct 24 2014 Chris Leech - 1.0.29-7 - enable vn2vn mode in fcoeadm diff --git a/sources b/sources index 90f84cb..a15b7e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -473f7dc7ba6a7bbbb2515f6a08573869 fcoe-utils-1.0.29.tar.gz +6fcbb0e06a2af0bc1f2f5453d1042eaf fcoe-utils-1.0.30.tar.gz From 6d59a5c320d2f69c7e3d3a37dc78ac5cbf5a0ee6 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Tue, 16 Jun 2015 18:24:01 -0700 Subject: [PATCH 03/49] check in missing patches --- ...ework-daemonizing-and-error-handling.patch | 78 +++++++++++++++++ ....30-2-fcoemon-fix-IEEE-state-machine.patch | 83 +++++++++++++++++++ ...tils-v1.0.30-3-sanmac-isn-t-required.patch | 26 ++++++ 3 files changed, 187 insertions(+) create mode 100644 fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch create mode 100644 fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch create mode 100644 fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch diff --git a/fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch b/fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch new file mode 100644 index 0000000..320ecd9 --- /dev/null +++ b/fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch @@ -0,0 +1,78 @@ +From f3af6bad75d7f6c90b9a170cbf9e4748ab4bb24e Mon Sep 17 00:00:00 2001 +From: Johannes Thumshirn +Date: Mon, 18 May 2015 17:02:59 +0000 +Subject: [PATCH] fcoemon: Rework daemonizing and error handling + +Rework error handling, which leads to daemonizing later in order to get the +error handling into effect. + +Signed-off-by: Johannes Thumshirn +Signed-off-by: Vasu Dev +--- + fcoemon.c | 31 ++++++++++++++++++++++--------- + 1 file changed, 22 insertions(+), 9 deletions(-) + +diff --git a/fcoemon.c b/fcoemon.c +index 3b5210c..c5edd1b 100644 +--- a/fcoemon.c ++++ b/fcoemon.c +@@ -3719,11 +3719,6 @@ int main(int argc, char **argv) + if (argc != optind) + fcm_usage(); + +- if (!fcm_fg && daemon(0, !fcoe_config.use_syslog)) { +- FCM_LOG("Starting daemon failed"); +- exit(EXIT_FAILURE); +- } +- + umask(0); + + /* +@@ -3770,22 +3765,40 @@ int main(int argc, char **argv) + } + + fcm_fcoe_init(); +- fcm_fc_events_init(); +- fcm_link_init(); /* NETLINK_ROUTE protocol */ ++ rc = fcm_fc_events_init(); ++ if (rc != 0) ++ exit(1); ++ ++ rc = fcm_link_init(); /* NETLINK_ROUTE protocol */ ++ if (rc != 0) ++ goto err_cleanup; ++ + fcm_dcbd_init(); +- fcm_srv_create(&srv_info); ++ rc = fcm_srv_create(&srv_info); ++ if (rc != 0) ++ goto err_cleanup; ++ ++ if (!fcm_fg && daemon(0, !fcoe_config.use_syslog)) { ++ FCM_LOG("Starting daemon failed"); ++ goto err_cleanup; ++ } ++ + sa_select_set_callback(fcm_handle_changes); + + rc = sa_select_loop(); + if (rc < 0) { + FCM_LOG_ERR(rc, "select error\n"); +- exit(EXIT_FAILURE); ++ goto err_cleanup; + } + fcm_dcbd_shutdown(); + fcm_srv_destroy(&srv_info); + if (rc == SIGHUP) + fcm_cleanup(); + return 0; ++ ++err_cleanup: ++ fcm_cleanup(); ++ exit(1); + } + + /******************************************************* +-- +2.1.0 + diff --git a/fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch b/fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch new file mode 100644 index 0000000..3af11b9 --- /dev/null +++ b/fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch @@ -0,0 +1,83 @@ +From 91c0c8c0a37af40b3fb4a37df6490a226348d152 Mon Sep 17 00:00:00 2001 +From: Vasu Dev +Date: Fri, 5 Jun 2015 14:52:10 -0700 +Subject: [PATCH] fcoemon: fix IEEE state machine + +Fix IEEE state machine for these issues:- + + - fcoeadm scan not working + - fcoeadm reset not working + - periodic fipvlan issuance even after fcoe instance created + +These issues are due to current IEEE states are not correctly +handled. The validate_ieee_info() return either activate or +wait actions and out of that only activate is really used to +enable fcoe instance and none other action are applicable in +IEEE state machine, so reduced to only activate and then +advance the state machine to new IEEE_ACTIVE state to allow +processing of scan & reset command once interface activated. + +This also fixes fipvlan issuance issue beside fixing scan and +reset fcoeadm commands. + +Signed-off-by: Vasu Dev +Tested-By: Jack Morgan +--- + fcoemon.c | 19 +++++++------------ + fcoemon.h | 1 + + 2 files changed, 8 insertions(+), 12 deletions(-) + +diff --git a/fcoemon.c b/fcoemon.c +index c5edd1b..c0af99b 100644 +--- a/fcoemon.c ++++ b/fcoemon.c +@@ -1341,6 +1341,7 @@ STR_ARR(ieee_states, "Unknown", "Out of range", + [IEEE_INIT] = "IEEE_INIT", + [IEEE_GET_STATE] = "IEEE_GET_STATE", + [IEEE_DONE] = "IEEE_DONE", ++ [IEEE_ACTIVE] = "IEEE_ACTIVE", + ); + + static void +@@ -3054,20 +3055,14 @@ static void fcm_netif_ieee_advance(struct fcm_netif *ff) + break; + case IEEE_DONE: + action = validate_ieee_info(ff); +- switch (action) { +- case FCP_DESTROY_IF: +- case FCP_ENABLE_IF: +- case FCP_ACTIVATE_IF: ++ if (action == FCP_ACTIVATE_IF) { + fcp_action_set(ff->ifname, action); +- break; +- case FCP_DISABLE_IF: +- case FCP_ERROR: +- fcp_action_set(ff->ifname, FCP_DISABLE_IF); +- break; +- case FCP_WAIT: +- default: +- break; ++ ieee_state_set(ff, IEEE_ACTIVE); + } ++ break; ++ case IEEE_ACTIVE: ++ /* TBD enable and disable if needed in IEEE mode */ ++ break; + default: + break; + } +diff --git a/fcoemon.h b/fcoemon.h +index c2ed7b1..3869bae 100644 +--- a/fcoemon.h ++++ b/fcoemon.h +@@ -80,6 +80,7 @@ enum ieee_state { + IEEE_INIT = 0, /* Starting state */ + IEEE_GET_STATE, /* Getting IEEE DCB state */ + IEEE_DONE, /* Received IEEE DCB state */ ++ IEEE_ACTIVE, /* IEEE is in ACTIVE state */ + IEEE_ERROR, /* Error receiving IEEE DCB state */ + }; + +-- +2.1.0 + diff --git a/fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch b/fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch new file mode 100644 index 0000000..67c583e --- /dev/null +++ b/fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch @@ -0,0 +1,26 @@ +From 8065e01707c3306380c684712e547fcf0e4e55da Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Thu, 5 Feb 2015 11:46:31 -0800 +Subject: [PATCH] sanmac isn't required + +Signed-off-by: Chris Leech +--- + lib/fip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/fip.c b/lib/fip.c +index 6657b61..5e5b179 100644 +--- a/lib/fip.c ++++ b/lib/fip.c +@@ -215,7 +215,7 @@ int fip_socket(int ifindex, enum fip_multi multi) + return s; + + rc = fip_socket_sanmac(s, ifindex, 1); +- if (rc < 0) { ++ if (rc < 0 && rc != -ENXIO) { + close(s); + return rc; + } +-- +2.1.0 + From a57062ed26a9c7fefa96f03cda0f03fb0554de9b Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Mon, 6 Jul 2015 20:47:50 -0700 Subject: [PATCH 04/49] fix display when libhbalinux includes hosts without a serial number --- ...lay-when-some-netdevs-don-t-have-ser.patch | 29 +++++++++++++++++++ fcoe-utils.spec | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch diff --git a/fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch b/fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch new file mode 100644 index 0000000..92d7800 --- /dev/null +++ b/fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch @@ -0,0 +1,29 @@ +From cc0037c0091a2b9baf04a5101ec83a6ec8db448b Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Mon, 6 Jul 2015 20:43:56 -0700 +Subject: [PATCH] fcoeadm: fix display when some netdevs don't have serial + numbers + +--- + fcoeadm_display.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/fcoeadm_display.c b/fcoeadm_display.c +index 9b96170..3b7fff9 100644 +--- a/fcoeadm_display.c ++++ b/fcoeadm_display.c +@@ -1294,9 +1294,8 @@ enum fcoe_status display_adapter_info(const char *ifname) + continue; + } + +- if (!strncmp(hba_attrs->SerialNumber, +- shba_attrs->SerialNumber, +- strlen(hba_attrs->SerialNumber))) { ++ if (!strcmp(hba_attrs->SerialNumber, ++ shba_attrs->SerialNumber)) { + show_port_info(sport_attrs); + hba_table_list->hba_table[j].displayed = 1; + } +-- +2.1.0 + diff --git a/fcoe-utils.spec b/fcoe-utils.spec index a940ff0..9fbd4c4 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.30 -Release: 1.git%{checkout}%{?dist} +Release: 2.git%{checkout}%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -19,6 +19,7 @@ ExcludeArch: ppc s390 s390x Patch1: fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch Patch2: fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch Patch3: fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch +Patch4: fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libhbaapi-devel >= 2.2.9-6 @@ -85,6 +86,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Mon Jul 06 2015 Chris Leech - 1.0.30-2 +- fix display when libhbalinux includes hosts without a serial number + * Tue Jun 16 2015 Chris Leech - 1.0.30-1 - rebase to upstream v1.0.30-2-g91c0c8c From b070fe1e6f201fa1aeed28d71775e2f3c4dbd3cd Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Mon, 6 Jul 2015 21:05:21 -0700 Subject: [PATCH 05/49] remove s390x from ExcludeArch --- fcoe-utils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 9fbd4c4..e3f1216 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.30 -Release: 2.git%{checkout}%{?dist} +Release: 3.git%{checkout}%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -15,7 +15,7 @@ Source0: %{name}-%{version}.tar.gz Source1: quickstart.txt Source2: fcoe.service Source3: fcoe.config -ExcludeArch: ppc s390 s390x +ExcludeArch: ppc s390 Patch1: fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch Patch2: fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch Patch3: fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch From 52c698f1e4d0012c32c03d3b3456d24ae32feae3 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Mon, 1 Feb 2016 13:53:43 -0800 Subject: [PATCH 06/49] package should not attempt to own /etc/bash_completion.d --- fcoe-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index e3f1216..207d3a2 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.30 -Release: 3.git%{checkout}%{?dist} +Release: 4.git%{checkout}%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -82,10 +82,13 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_sysconfdir}/fcoe/ %config(noreplace) %{_sysconfdir}/fcoe/cfg-ethx %config(noreplace) %{_sysconfdir}/sysconfig/fcoe -%{_sysconfdir}/bash_completion.d/ +%{_sysconfdir}/bash_completion.d/* %{_libexecdir}/fcoe/ %changelog +* Mon Feb 01 2016 Chris Leech - 1.0.30-4.git91c0c8c +- 1303433 package should not attempt to own /etc/bash_completion.d + * Mon Jul 06 2015 Chris Leech - 1.0.30-2 - fix display when libhbalinux includes hosts without a serial number From ce30a4eb900ea1370c880f9737e86bf37177143a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 20:18:06 +0000 Subject: [PATCH 07/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 207d3a2..2185e0c 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.30 -Release: 4.git%{checkout}%{?dist} +Release: 5.git%{checkout}%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -86,6 +86,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.0.30-5.git91c0c8c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Feb 01 2016 Chris Leech - 1.0.30-4.git91c0c8c - 1303433 package should not attempt to own /etc/bash_completion.d From 072cb4d2459d1f2aab821048432cdaaf7820a379 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Thu, 9 Feb 2017 11:00:02 -0800 Subject: [PATCH 08/49] update to 1.0.32 patch to fix up rawhide/gcc7 build errors due to Werror=format-truncation --- fcoe-utils-1.0.29-29-g9267509.patch | 1283 ----------------- ...lags-to-fcoemon-to-enable-vn2vn-mode.patch | 45 - fcoe-utils-ggc7-fmt-truc-err.patch | 53 + ...ework-daemonizing-and-error-handling.patch | 78 - ....30-2-fcoemon-fix-IEEE-state-machine.patch | 83 -- ...tils-v1.0.30-3-sanmac-isn-t-required.patch | 26 - ...lay-when-some-netdevs-don-t-have-ser.patch | 29 - fcoe-utils.spec | 20 +- sources | 2 +- 9 files changed, 63 insertions(+), 1556 deletions(-) delete mode 100644 fcoe-utils-1.0.29-29-g9267509.patch delete mode 100644 fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch create mode 100644 fcoe-utils-ggc7-fmt-truc-err.patch delete mode 100644 fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch delete mode 100644 fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch delete mode 100644 fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch delete mode 100644 fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch diff --git a/fcoe-utils-1.0.29-29-g9267509.patch b/fcoe-utils-1.0.29-29-g9267509.patch deleted file mode 100644 index db59faa..0000000 --- a/fcoe-utils-1.0.29-29-g9267509.patch +++ /dev/null @@ -1,1283 +0,0 @@ -sync to v1.0.29-29-g9267509 - -9267509 fcoeadm: display strings for new port speeds -671b7f9 fcoemon: Fix IEEE state machine -4982e60 man: Fix typo in fcoemon documentation -f90bbd7 FIPVLAN: Really break out of the recv_loop upon fip_recv error -fa308a6 doc: Update QUICKSTART/INSTALL docs for systemd init file install -09caead fcoemon: systemd socket activation -41e9d79 fcoemon: add systemd service file -d8deef2 fcnsq: Fixup 64bit integer handling -6750b2a fcnsq: Fixup help text -e566b3e Fix integer formatting -9869390 build: Fix build with '-Wl,--as-needed' -0e5d536 build: Add missing 'DESTDIR' when installing bash completion -6bde8d1 fipvlan: filter interfaces from rtnl_getlink -45d0e70 fipvlan: handle errors from fip socket creation -78ea81a fipvlan: break out of receive loop on error -86928f2 fipvlan: Do not shut down FCoE connections on physical interface -08d9872 fipvlan: Update manpage to reflect correct timeout -0559d7d fipvlan: Leave link up if requested -9ade5c6 fipvlan: update manpage -3ded166 fipvlan: Re-send VLAN discovery -9f5e376 fipvlan: Update wait loop to wait for VLANs -16e421a fipvlan: Start FCoE from netlink handler -ac1fc20 fipvlan: create VLANs from netlink handler -6ce709f fipvlan: Extract create_missing_vlan function from loop -ef209fd fipvlan: start VLAN interface from netlink handler -29d1722 fipvlan: Only shutdown interfaces if no vlans are created -921a055 fipvlan fails on powerpc -0f63a3e Don't call AM_INIT_AUTOMAKE twice -fd085bc man: Fix small typo regarding --fcf option ---- - INSTALL | 3 + - Makefile.am | 16 ++- - QUICKSTART | 3 + - configure.ac | 9 +- - doc/fcoeadm.8 | 18 +-- - doc/fcoeadm.txt | 4 +- - doc/fcoemon.8 | 2 +- - doc/fcoemon.txt | 3 +- - doc/fipvlan.8 | 17 ++- - doc/fipvlan.txt | 9 +- - etc/systemd/fcoe.service | 14 ++ - etc/systemd/fcoemon.socket | 6 + - fcnsq.c | 20 ++- - fcoeadm_display.c | 10 +- - fcoemon.c | 100 ++++++++++++-- - fcping.c | 11 +- - fipvlan.c | 327 ++++++++++++++++++++++++++------------------- - lib/fip.c | 20 ++- - 18 files changed, 394 insertions(+), 198 deletions(-) - -diff --git a/INSTALL b/INSTALL -index 3abdf07..ea8c95e 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -19,6 +19,9 @@ DEPENDENCIES - - 1) Bootstrap, configure, make and make install - # ./bootstrap.sh -+ Either execute the next line for System V init script install - # rpm --eval "%configure" | sh -+ or the following line to install systemd unit scripts -+ # rpm --eval "%configure --with-systemdsystemunitdir=/" | sh - # make - # make install -diff --git a/Makefile.am b/Makefile.am -index 5cbc15f..e7df6f5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -9,21 +9,18 @@ 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 -+fcoeadm_LDADD = lib/libutil.a libopenfcoe.a $(HBAAPI_LIBS) - fcoeadm_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS) --fcoeadm_LDFLAGS = $(AM_LDFLAGS) $(HBAAPI_LIBS) - - ## rules for building fcoemon - fcoemon_SOURCES = fcoemon.c --fcoemon_LDADD = lib/libutil.a -+fcoemon_LDADD = lib/libutil.a -lrt - fcoemon_CFLAGS = $(AM_CFLAGS) $(DCBD_CFLAGS) --fcoemon_LDFLAGS = $(AM_LDFLAGS) -lrt - - ## rules for building fcping - fcping_SOURCES = fcping.c --fcping_LDADD = lib/libutil.a -+fcping_LDADD = lib/libutil.a $(HBAAPI_LIBS) -lrt - fcping_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS) --fcping_LDFLAGS = $(AM_LDFLAGS) $(HBAAPI_LIBS) -lrt - - ## rules for building fipvlan - fipvlan_SOURCES = fipvlan.c -@@ -44,6 +41,11 @@ noinst_HEADERS = fcoeadm_display.h fcoe_clif.h fcoemon.h \ - fcoe_configdir = ${sysconfdir}/fcoe - dist_fcoe_config_DATA = etc/cfg-ethx - -+## install systemd service files -+if HAVE_SYSTEMD -+systemdsystemunit_DATA = etc/systemd/fcoe.service etc/systemd/fcoemon.socket -+endif -+ - ## man pages for fcoeadm and fcoemon - dist_man_MANS = doc/fcoeadm.8 doc/fcoemon.8 doc/fipvlan.8 doc/fcrls.8 \ - doc/fcnsq.8 doc/fcping.8 -@@ -67,7 +69,7 @@ init_d_SCRIPTS = etc/initd/fcoe - - dist_noinst_DATA = README COPYING INSTALL fcoe-utils.spec etc/config - --BASH_COMPLETION_DIR=/etc/bash_completion.d/ -+BASH_COMPLETION_DIR=$(DESTDIR)/etc/bash_completion.d/ - - install-data-hook: - if [ ! -f ${DESTDIR}${fcoe_configdir}/config ] ; then \ -diff --git a/QUICKSTART b/QUICKSTART -index 6fc82b3..c001bc1 100644 ---- a/QUICKSTART -+++ b/QUICKSTART -@@ -201,7 +201,10 @@ PROCESS - 2) Bootstrap, configure, make and make install - # cd fcoe-utils - # ./bootstrap.sh -+ Either execute the next line for System V init script install - # rpm --eval "%configure" | sh -+ or the following line to install systemd unit scripts -+ # rpm --eval "%configure --with-systemdsystemunitdir=/" | sh - # make - # make install - -diff --git a/configure.ac b/configure.ac -index 73c140f..107d039 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,4 @@ - AC_INIT([fcoe-utils], [1.0.29], [fcoe-devel@open-fcoe.org]) --AM_INIT_AUTOMAKE([foreign]) - - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - AM_INIT_AUTOMAKE([foreign]) -@@ -18,6 +17,14 @@ AC_SUBST([LLDPAD_CFLAGS]) - PKG_CHECK_MODULES([LIBHBALINUX], [libhbalinux >= 1.0.13]) - AC_SUBST([LIBHBALINUX_CFLAGS]) - -+PKG_PROG_PKG_CONFIG -+AC_ARG_WITH([systemdsystemunitdir], -+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], -+ [Directory for systemd service files]), [], -+ [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) -+ - AC_CONFIG_FILES([Makefile fcoe-utils.spec include/fcoe_utils_version.h]) - AC_OUTPUT - -diff --git a/doc/fcoeadm.8 b/doc/fcoeadm.8 -index 11da6e3..2fefd70 100644 ---- a/doc/fcoeadm.8 -+++ b/doc/fcoeadm.8 -@@ -1,13 +1,13 @@ - '\" t - .\" Title: fcoeadm - .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] --.\" Generator: DocBook XSL Stylesheets v1.76.1 --.\" Date: 11/08/2012 -+.\" Generator: DocBook XSL Stylesheets v1.78.1 -+.\" Date: 10/14/2013 - .\" Manual: Open-FCoE Tools - .\" Source: Open-FCoE - .\" Language: English - .\" --.TH "FCOEADM" "8" "11/08/2012" "Open\-FCoE" "Open\-FCoE Tools" -+.TH "FCOEADM" "8" "10/14/2013" "Open\-FCoE" "Open\-FCoE Tools" - .\" ----------------------------------------------------------------- - .\" * Define some portability stuff - .\" ----------------------------------------------------------------- -@@ -39,7 +39,7 @@ fcoeadm \- The Open\-FCoE Administration Tool - .sp - \fBfcoeadm\fR \-i|\-\-interface [\fIethX\fR] - .sp --\fBfcoeadm\fR \-f|\-\-fcfs [\fIethX\fR] -+\fBfcoeadm\fR \-f|\-\-fcf [\fIethX\fR] - .sp - \fBfcoeadm\fR \-t|\-\-target [\fIethX\fR] - .sp -@@ -91,7 +91,7 @@ Rescan for new targets and LUNs on the provided instance\&. This command will no - Show information about the FCoE instance on the specified network interface, or all FCoE instances if no network interface is specified\&. - .RE - .PP --\fB\-f\fR, \fB\-\-fcfs\fR [\fIethX\fR] -+\fB\-f\fR, \fB\-\-fcf\fR [\fIethX\fR] - .RS 4 - Show information about the discovered Fibre Channel Forwarders (FCFs) on the specified network interface, or all discovered FCFs if no network interface is specified\&. - .RE -@@ -143,13 +143,9 @@ command\&. - .RE - .SH "INTERFACE NAMES" - .sp --The actual name for \fIethX\fR depends on the \fBAUTO_VLAN\fR setting in --the fcoemon interface configuration (/etc/fcoe/cfg-ethX, see \fBfcoemon\fR)\&. -+The actual name for \fIethX\fR depends on the \fBAUTO_VLAN\fR setting in the fcoemon interface configuration (/etc/fcoe/cfg\-ethX, see \fBfcoemon\fR)\&. - .sp --If \fBAUTO_VLAN\fR is set to \fIyes\fR, the interface name \fIethX\fR --references the network device itself. If \fBAUTO_VLAN\fR is set to --\fIno\fR, the interface name \fIethX\fR references the VLAN device\&. --.RE -+If \fBAUTO_VLAN\fR is set to \fIyes\fR, the interface name \fIethX\fR references the network device itself\&. If \fBAUTO_VLAN\fR is set to \fIno\fR, the interface name \fIethX\fR references the VLAN device\&. - .SH "EXAMPLES" - .sp - Creates an FCoE instance on eth2\&.101 -diff --git a/doc/fcoeadm.txt b/doc/fcoeadm.txt -index 788625c..28ed482 100644 ---- a/doc/fcoeadm.txt -+++ b/doc/fcoeadm.txt -@@ -29,7 +29,7 @@ SYNOPSIS - - *fcoeadm* -i|--interface [_ethX_] - --*fcoeadm* -f|--fcfs [_ethX_] -+*fcoeadm* -f|--fcf [_ethX_] - - *fcoeadm* -t|--target [_ethX_] - -@@ -89,7 +89,7 @@ OPERATIONS - Show information about the FCoE instance on the specified network - interface, or all FCoE instances if no network interface is specified. - --*-f*, *--fcfs* [_ethX_]:: -+*-f*, *--fcf* [_ethX_]:: - Show information about the discovered Fibre Channel Forwarders (FCFs) - on the specified network interface, or all discovered FCFs if no - network interface is specified. -diff --git a/doc/fcoemon.8 b/doc/fcoemon.8 -index e9a045b..020394e 100644 ---- a/doc/fcoemon.8 -+++ b/doc/fcoemon.8 -@@ -358,7 +358,7 @@ indicates whether a FIP responder should be activated on this device to support - Note that the attached Ethernet peer device (e\&.g\&. FCoE capable switch port) must have compatible settings For DCB and FCoE to function properly\&. - .SS "/etc/init\&.d/fcoe" - .sp --This is the \fBfcoe\fR system service script\&. This script is invoked by the init process or by the service command to start and stop the \fBfcoemon\fR\&. -+This is the \fBfcoe\fR system service script\&. This script is invoked by the init process or by the service command to start and stop the \fBfcoemon\fR\&. On systemd-enabled systems, \fBfcoemon\fR is controlled via the \fBfcoe.service\fR unit. - .SH "VLAN NAMING CONVENTIONS" - .sp - If a new VLAN device is created (see the description of the \fIAUTO_VLAN\fR setting above), it will have the name \fIdev\fR\&.\fIvlan\fR\-fcoe; where \fIdev\fR is the name of the Ethernet parent device and \fIvlan\fR is the discovered VLAN ID number\&. -diff --git a/doc/fcoemon.txt b/doc/fcoemon.txt -index ec15197..7ccf892 100644 ---- a/doc/fcoemon.txt -+++ b/doc/fcoemon.txt -@@ -56,7 +56,7 @@ OPTIONS - *-d*, *--debug*:: - Enable debugging messages. - *-l*, *--legacy*:: -- Force fcoemon to use the legacy /sys/modlue/libfcoe/parameters/ -+ Force fcoemon to use the legacy /sys/module/libfcoe/parameters/ - interface. The default is to use the newer /sys/bus/fcoe/ interfaces - if they are available. - *-s*, *--syslog*:: -@@ -214,6 +214,7 @@ must have compatible settings For DCB and FCoE to function properly. - ~~~~~~~~~~~~~~~~ - This is the *fcoe* system service script. This script is invoked by the - init process or by the service command to start and stop the *fcoemon*. -+On systemd-enabled systems, *fcoemon* is controlled via the *fcoe.service* unit. - - VLAN NAMING CONVENTIONS - ----------------------- -diff --git a/doc/fipvlan.8 b/doc/fipvlan.8 -index f81cb3a..1d2b707 100644 ---- a/doc/fipvlan.8 -+++ b/doc/fipvlan.8 -@@ -1,13 +1,13 @@ - '\" t - .\" Title: fipvlan - .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] --.\" Generator: DocBook XSL Stylesheets v1.76.1 --.\" Date: 03/18/2013 -+.\" Generator: DocBook XSL Stylesheets v1.78.1 -+.\" Date: 12/02/2013 - .\" Manual: Open-FCoE Tools - .\" Source: Open-FCoE - .\" Language: English - .\" --.TH "FIPVLAN" "8" "03/18/2013" "Open\-FCoE" "Open\-FCoE Tools" -+.TH "FIPVLAN" "8" "12/02/2013" "Open\-FCoE" "Open\-FCoE Tools" - .\" ----------------------------------------------------------------- - .\" * Define some portability stuff - .\" ----------------------------------------------------------------- -@@ -29,9 +29,9 @@ - fipvlan \- Fibre Channel over Ethernet VLAN Discovery - .SH "SYNOPSIS" - .sp --\fBfipvlan\fR [\-c|\-\-create] [\-s|\-\-start] [\-m|\-\-mode fabric|vn2vn] \fIinterfaces\fR -+\fBfipvlan\fR [\-c|\-\-create] [\-d|\-\-debug] [\-s|\-\-start] [\-m|\-\-mode fabric|vn2vn] [\-u|\-\-link\-up] \fIinterfaces\fR - .sp --\fBfipvlan\fR \-a|\-\-auto [\-c|\-\-create] [\-d|\-\-debug] [\-s|\-\-start] [\-m|\-\-mode fabric|vn2vn] [\-l|\-\-link\-retry \fIcount\fR] -+\fBfipvlan\fR \-a|\-\-auto [\-c|\-\-create] [\-d|\-\-debug] [\-s|\-\-start] [\-m|\-\-mode fabric|vn2vn] [\-l|\-\-link\-retry \fIcount\fR] [\-u|\-\-link\-up] - .sp - \fBfipvlan\fR \-h|\-\-help - .sp -@@ -83,7 +83,12 @@ to VLAN interface names\&. - .RS 4 - Retry check for link up to - \fIcount\fR --times\&. The link state is checked every 500 ms\&. The default number of retries is 20\&. -+times\&. The link state is checked every 1000 ms\&. The default number of retries is 20\&. -+.RE -+.PP -+\fB\-u\fR, \fB\-\-link\-up\fR -+.RS 4 -+Leave link up if a FIP response has been received\&. - .RE - .PP - \fB\-h\fR, \fB\-\-help\fR -diff --git a/doc/fipvlan.txt b/doc/fipvlan.txt -index 9699197..5ba0324 100644 ---- a/doc/fipvlan.txt -+++ b/doc/fipvlan.txt -@@ -19,10 +19,12 @@ fipvlan - Fibre Channel over Ethernet VLAN Discovery - - SYNOPSIS - -------- --*fipvlan* [-c|--create] [-s|--start] [-m|--mode fabric|vn2vn] _interfaces_ -+*fipvlan* [-c|--create] [-d|--debug] [-s|--start] -+ [-m|--mode fabric|vn2vn] [-u|--link-up] _interfaces_ - - *fipvlan* -a|--auto [-c|--create] [-d|--debug] - [-s|--start] [-m|--mode fabric|vn2vn] [-l|--link-retry _count_] -+ [-u|--link-up] - - *fipvlan* -h|--help - -@@ -73,7 +75,10 @@ OPTIONS - - *-l*, *--link-retry* _count_:: - Retry check for link up to _count_ times. The link state is -- checked every 500 ms. The default number of retries is 20. -+ checked every 1000 ms. The default number of retries is 20. -+ -+*-u*, *--link-up*:: -+ Leave link up if a FIP response has been received. - - *-h*, *--help*:: - Display a help message with basic usage instructions -diff --git a/etc/systemd/fcoe.service b/etc/systemd/fcoe.service -new file mode 100644 -index 0000000..5e5c8a2 ---- /dev/null -+++ b/etc/systemd/fcoe.service -@@ -0,0 +1,14 @@ -+[Unit] -+Description=Open-FCoE initiator daemon -+After=syslog.target network.target -+ -+[Service] -+Type=simple -+EnvironmentFile=/etc/sysconfig/fcoe -+ExecStartPre=/sbin/modprobe -qa $SUPPORTED_DRIVERS -+ExecStart=/usr/sbin/fcoemon $FCOEMON_OPTS -+ -+[Install] -+WantedBy=multi-user.target -+Also=lldpad.socket -+Also=fcoemon.socket -diff --git a/etc/systemd/fcoemon.socket b/etc/systemd/fcoemon.socket -new file mode 100644 -index 0000000..4de8715 ---- /dev/null -+++ b/etc/systemd/fcoemon.socket -@@ -0,0 +1,6 @@ -+[Socket] -+ListenDatagram=@/com/intel/fcoemon -+PassCredentials=true -+ -+[Install] -+WantedBy=sockets.target -diff --git a/fcnsq.c b/fcnsq.c -index 7b45a32..1597cd5 100644 ---- a/fcnsq.c -+++ b/fcnsq.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -228,7 +229,7 @@ static int gpn_id(int bsg, u32 fcid) - rjt = gn_id(bsg, fcid, FC_NS_GPN_ID, &wwpn); - if (rjt) - goto fail; -- print_result("Port Name", "%16.16llx\n", wwpn); -+ print_result("Port Name", "%16.16jx\n", (uintmax_t)wwpn); - return 0; - fail: - if (rjt == (u16) ~0) -@@ -249,7 +250,7 @@ static int gnn_id(int bsg, u32 fcid) - rjt = gn_id(bsg, fcid, FC_NS_GNN_ID, &wwnn); - if (rjt) - goto fail; -- print_result("Node Name", "%16.16llx\n", wwnn); -+ print_result("Node Name", "%16.16jx\n", (uintmax_t)wwnn); - return 0; - fail: - if (rjt == (u16) ~0) -@@ -365,7 +366,7 @@ static void help(int status) - " --gspn \n" - " --gsnn \n" - "Options:\n" -- " --quiet print minimal results on success, and no error messages\n" -+ " --quiet|-q print minimal results on success, and no error messages\n" - "\n" - "Port IDs and World Wide Names must be specified in hexadecimal.\n" - ); -@@ -376,11 +377,12 @@ int main(int argc, char *argv[]) - { - char *bsg; - int bsg_dev; -- u32 port_id; -- u64 wwnn; -+ u32 port_id = 0; -+ u64 wwnn = 0; - int rc = 0; - enum commands cmd = 0; - char c; -+ uintmax_t wwnn_tmp = 0; - - while(1) { - c = getopt_long_only(argc, argv, "", options, NULL); -@@ -399,13 +401,17 @@ int main(int argc, char *argv[]) - if (cmd) - help(-1); - cmd = c; -- sscanf(optarg, "%x", &port_id); -+ if (sscanf(optarg, "%x", &port_id) != 1) -+ help(-1); - break; - case GSNN_NN: - if (cmd) - help(-1); - cmd = c; -- sscanf(optarg, "%llx", &wwnn); -+ if (sscanf(optarg, "%jx", &wwnn_tmp) == 1) -+ wwnn = (u64)wwnn_tmp; -+ else -+ help(-1); - break; - } - } -diff --git a/fcoeadm_display.c b/fcoeadm_display.c -index 287e370..9b96170 100644 ---- a/fcoeadm_display.c -+++ b/fcoeadm_display.c -@@ -110,7 +110,13 @@ struct sa_nameval port_speeds[] = { - { "Unknown", HBA_PORTSPEED_UNKNOWN }, - { "1 Gbit", HBA_PORTSPEED_1GBIT }, - { "2 Gbit", HBA_PORTSPEED_2GBIT }, -+ { "4 Gbit", HBA_PORTSPEED_4GBIT }, - { "10 Gbit", HBA_PORTSPEED_10GBIT }, -+ { "8 Gbit", HBA_PORTSPEED_8GBIT }, -+ { "16 Gbit", HBA_PORTSPEED_16GBIT }, -+ { "32 Gbit", HBA_PORTSPEED_32GBIT }, -+ { "20 Gbit", HBA_PORTSPEED_20GBIT }, -+ { "40 Gbit", HBA_PORTSPEED_40GBIT }, - { "Not Negotiated", HBA_PORTSPEED_NOT_NEGOTIATED }, - { NULL, 0 } - }; -@@ -1417,8 +1423,8 @@ static void print_fcoe_fcf_device(void *ep, UNUSED void *arg) - if (!buf) - buf = temp; - printf(" Connection Mode: %s\n", buf); -- printf(" Fabric Name: 0x%016lx\n", fcf->fabric_name); -- printf(" Switch Name 0x%016lx\n", fcf->switch_name); -+ printf(" Fabric Name: 0x%016" PRIx64 "\n", fcf->fabric_name); -+ printf(" Switch Name 0x%016" PRIx64 "\n", fcf->switch_name); - mac2str(fcf->mac, mac, MAX_STR_LEN); - printf(" MAC Address: %s\n", mac); - printf(" FCF Priority: %u\n", fcf->priority); -diff --git a/fcoemon.c b/fcoemon.c -index a5babfa..b3120bc 100644 ---- a/fcoemon.c -+++ b/fcoemon.c -@@ -1357,12 +1357,8 @@ ieee_state_set(struct fcm_netif *ff, enum ieee_state new_state) - getstr(&ieee_states, new_state)); - } - -- if (new_state == IEEE_GET_STATE) { -- ff->ieee_state = new_state; -+ if (new_state == IEEE_GET_STATE) - clear_ieee_info(ff); -- ieee_get_req(ff); -- return; -- } - - ff->ieee_state = new_state; - ff->ieee_resp_pending = 0; -@@ -2637,7 +2633,7 @@ static void fcm_dcbd_get_oper(struct fcm_netif *ff, char *resp, char *cp) - - if (ep) { - FCM_LOG_DEV(ff, "Invalid get oper response " -- "parse error byte %ld, resp %s", ep - cp, cp); -+ "parse error byte %td, resp %s", ep - cp, cp); - fcm_dcbd_state_set(ff, FCD_ERROR); - } else { - if (val && fcoe_config.debug) -@@ -3035,6 +3031,50 @@ static void fcm_fcoe_action(struct fcoe_port *p) - - /* - * Called for all ports. For FCoE ports and candidates, -+ * get IEEE DCBX information and set the next action. -+ */ -+static void fcm_netif_ieee_advance(struct fcm_netif *ff) -+{ -+ enum fcp_action action; -+ -+ ASSERT(ff); -+ ASSERT(fcm_clif); -+ -+ if (fcm_clif->cl_busy) -+ return; -+ -+ if (ff->ieee_resp_pending) -+ return; -+ -+ switch (ff->ieee_state) { -+ case IEEE_INIT: -+ break; -+ case IEEE_GET_STATE: -+ ieee_get_req(ff); -+ break; -+ case IEEE_DONE: -+ action = validate_ieee_info(ff); -+ switch (action) { -+ case FCP_DESTROY_IF: -+ case FCP_ENABLE_IF: -+ case FCP_ACTIVATE_IF: -+ fcp_action_set(ff->ifname, action); -+ break; -+ case FCP_DISABLE_IF: -+ case FCP_ERROR: -+ fcp_action_set(ff->ifname, FCP_DISABLE_IF); -+ break; -+ case FCP_WAIT: -+ default: -+ break; -+ } -+ default: -+ break; -+ } -+} -+ -+/* -+ * Called for all ports. For FCoE ports and candidates, - * get information and send to dcbd. - */ - static void fcm_netif_advance(struct fcm_netif *ff) -@@ -3161,8 +3201,10 @@ static void fcm_handle_changes(void) - /* - * Perform pending actions (dcbd queries) on network interfaces. - */ -- TAILQ_FOREACH(ff, &fcm_netif_head, ff_list) -+ TAILQ_FOREACH(ff, &fcm_netif_head, ff_list) { - fcm_netif_advance(ff); -+ fcm_netif_ieee_advance(ff); -+ } - - /* - * Perform actions on FCoE ports -@@ -3546,12 +3588,54 @@ err: - sendto(snum, rbuf, MSG_RBUF, 0, (struct sockaddr *)&from, fromlen); - } - -+static int fcm_systemd_socket(void) -+{ -+ char *env, *ptr; -+ unsigned int p, l; -+ -+ env = getenv("LISTEN_PID"); -+ if (!env) -+ return -1; -+ -+ p = strtoul(env, &ptr, 10); -+ if (ptr && ptr == env) { -+ FCM_LOG_DBG("Invalid value '%s' for LISTEN_PID\n", env); -+ return -1; -+ } -+ if ((pid_t)p != getpid()) { -+ FCM_LOG_DBG("Invalid PID '%d' from LISTEN_PID\n", p); -+ return -1; -+ } -+ env = getenv("LISTEN_FDS"); -+ if (!env) { -+ FCM_LOG_DBG("LISTEN_FDS is not set\n"); -+ return -1; -+ } -+ l = strtoul(env, &ptr, 10); -+ if (ptr && ptr == env) { -+ FCM_LOG_DBG("Invalid value '%s' for LISTEN_FDS\n", env); -+ return -1; -+ } -+ if (l != 1) { -+ FCM_LOG_DBG("LISTEN_FDS specified %d fds\n", l); -+ return -1; -+ } -+ /* systemd returns fds with an offset of '3' */ -+ return 3; -+} -+ - static int fcm_srv_create(struct fcm_srv_info *srv_info) - { - socklen_t addrlen; - struct sockaddr_un addr; - int rc = 0; - -+ srv_info->srv_sock = fcm_systemd_socket(); -+ if (srv_info->srv_sock > 0) { -+ FCM_LOG_DBG("Using systemd socket\n"); -+ goto out_done; -+ } -+ - srv_info->srv_sock = socket(AF_LOCAL, SOCK_DGRAM, 0); - if (srv_info->srv_sock < 0) { - FCM_LOG_ERR(errno, "Failed to create socket\n"); -@@ -3570,7 +3654,7 @@ static int fcm_srv_create(struct fcm_srv_info *srv_info) - rc = errno; - goto err_close; - } -- -+out_done: - sa_select_add_fd(srv_info->srv_sock, fcm_srv_receive, - NULL, NULL, srv_info); - -diff --git a/fcping.c b/fcping.c -index c6f74a6..399b778 100644 ---- a/fcping.c -+++ b/fcping.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -810,17 +811,17 @@ static void fp_check_data_len(void) - printf("Maximum ECHO data allowed by the Fabric (0x%06x) : %d bytes.\n" - "Maximum ECHO data allowed by the Source (0x%06x) : %d bytes.\n" - "Maximum ECHO data allowed by the Target (0x%06x) : %d bytes.\n" -- "Maximum ECHO data requested from user input (-s) : %lu " -+ "Maximum ECHO data requested from user input (-s) : %" PRIu32 " " - "(default %d) bytes.\n", - FC_WKA_FABRIC_CONTROLLER, flen, sid, slen, fp_did, dlen, -- fp_len - FP_LEN_ECHO, FP_LEN_DEF); -+ (uint32_t)(fp_len - FP_LEN_ECHO), FP_LEN_DEF); - - /* fp_len is the total payload, including 4 bytes for ECHO command */ - fp_len = MIN(fp_len, plen + FP_LEN_ECHO); -- printf("Actual FC ELS ECHO data size used : %lu bytes.\n" -+ printf("Actual FC ELS ECHO data size used : %" PRIu32 " bytes.\n" - "Actual FC ELS ECHO payload size used : %d bytes " -- "(including %ld bytes ECHO command).\n", -- fp_len - FP_LEN_ECHO, fp_len, FP_LEN_ECHO); -+ "(including %zu bytes ECHO command).\n", -+ (uint32_t)(fp_len - FP_LEN_ECHO), fp_len, FP_LEN_ECHO); - } - - /* -diff --git a/fipvlan.c b/fipvlan.c -index 6f8cf39..cc71412 100644 ---- a/fipvlan.c -+++ b/fipvlan.c -@@ -67,6 +67,7 @@ struct { - bool start; - bool vn2vn; - bool debug; -+ bool link_up; - int link_retry; - char suffix[256]; - } config = { -@@ -76,6 +77,7 @@ struct { - .create = false, - .vn2vn = false, - .debug = false, -+ .link_up = false, - .link_retry = 20, - .suffix = "", - }; -@@ -139,6 +141,7 @@ struct iff { - bool req_sent; - bool resp_recv; - bool fip_ready; -+ bool fcoe_started; - TAILQ_ENTRY(iff) list_node; - struct iff_list_head vlans; - }; -@@ -157,6 +160,8 @@ struct fcf { - struct fcf_list_head fcfs = TAILQ_HEAD_INITIALIZER(fcfs); - static struct fcf_list_head vn2vns = TAILQ_HEAD_INITIALIZER(vn2vns); - -+static int create_and_start_vlan(struct fcf *fcf, bool vn2vn); -+ - static struct fcf *lookup_fcf(struct fcf_list_head *head, int ifindex, - uint16_t vlan, unsigned char *mac) - { -@@ -316,6 +321,9 @@ static int fip_recv_vlan_note(struct fiphdr *fh, int ifindex, bool vn2vn) - fcf->vlan = vlan; - memcpy(fcf->mac_addr, tlvs.mac->mac_addr, ETHER_ADDR_LEN); - TAILQ_INSERT_TAIL(head, fcf, list_node); -+ if (!config.create) -+ continue; -+ create_and_start_vlan(fcf, vn2vn); - } - - return 0; -@@ -362,8 +370,14 @@ static void rtnl_recv_newlink(struct nlmsghdr *nh) - struct rtattr *linkinfo[__IFLA_INFO_MAX]; - struct rtattr *vlan[__IFLA_VLAN_MAX]; - struct iff *iff, *real_dev; -+ struct fcf_list_head *head; - bool running; - -+ if (config.vn2vn) -+ head = &vn2vns; -+ else -+ head = &fcfs; -+ - FIP_LOG_DBG("RTM_NEWLINK: ifindex %d, type %d, flags %x", - ifm->ifi_index, ifm->ifi_type, ifm->ifi_flags); - -@@ -378,12 +392,38 @@ static void rtnl_recv_newlink(struct nlmsghdr *nh) - running = !!(ifm->ifi_flags & (IFF_RUNNING | IFF_SLAVE)); - iff = lookup_iff(ifm->ifi_index, NULL); - if (iff) { -+ int ifindex; -+ - /* already tracking, update operstate and return */ - iff->running = running; -- if (iff->running) -- pfd_add(iff->ps); -- else -+ if (!iff->running) { - pfd_remove(iff->ps); -+ return; -+ } -+ pfd_add(iff->ps); -+ if (!config.start) -+ return; -+ -+ FIP_LOG_DBG("Checking for FCoE on %sif %d", -+ iff->is_vlan ? "VLAN " : "", iff->ifindex); -+ if (iff->is_vlan) { -+ real_dev = find_vlan_real_dev(iff); -+ if (!real_dev) { -+ FIP_LOG_ERR(ENODEV, "VLAN %d without a parent", -+ iff->ifindex); -+ return; -+ } -+ ifindex = real_dev->ifindex; -+ } else -+ ifindex = iff->ifindex; -+ -+ if (!iff->fcoe_started && -+ lookup_fcf(head, ifindex, iff->vid, NULL)) { -+ printf("Starting FCoE on interface %s\n", -+ iff->ifname); -+ fcoe_instance_start(iff->ifname); -+ iff->fcoe_started = true; -+ } - return; - } - -@@ -407,6 +447,19 @@ static void rtnl_recv_newlink(struct nlmsghdr *nh) - memcpy(iff->mac_addr, RTA_DATA(ifla[IFLA_ADDRESS]), ETHER_ADDR_LEN); - strncpy(iff->ifname, RTA_DATA(ifla[IFLA_IFNAME]), IFNAMSIZ); - -+ if (!config.automode) { -+ int i, iff_selected = 0; -+ -+ for (i = 0; i < config.namec; i++) { -+ if (!strcmp(iff->ifname, config.namev[i])) -+ iff_selected = 1; -+ } -+ if (!iff_selected) { -+ FIP_LOG_DBG("ignoring if %s\n", iff->ifname); -+ free(iff); -+ return; -+ } -+ } - if (ifla[IFLA_LINKINFO]) { - parse_linkinfo(linkinfo, ifla[IFLA_LINKINFO]); - /* Track VLAN devices separately */ -@@ -416,11 +469,16 @@ static void rtnl_recv_newlink(struct nlmsghdr *nh) - parse_vlaninfo(vlan, linkinfo[IFLA_INFO_DATA]); - iff->vid = *(int *)RTA_DATA(vlan[IFLA_VLAN_ID]); - real_dev = find_vlan_real_dev(iff); -- if (real_dev) -- TAILQ_INSERT_TAIL(&real_dev->vlans, -- iff, list_node); -- else -+ if (!real_dev) { - free(iff); -+ return; -+ } -+ TAILQ_INSERT_TAIL(&real_dev->vlans, iff, list_node); -+ if (!iff->running) { -+ FIP_LOG_DBG("vlan if %d not running, " -+ "starting", iff->ifindex); -+ rtnl_set_iff_up(iff->ifindex, NULL); -+ } - return; - } - /* ignore bonding interfaces */ -@@ -435,7 +493,7 @@ static void rtnl_recv_newlink(struct nlmsghdr *nh) - - /* command line arguments */ - --#define GETOPT_STR "acdf:l:m:shv" -+#define GETOPT_STR "acdf:l:m:suhv" - - static const struct option long_options[] = { - { "auto", no_argument, NULL, 'a' }, -@@ -445,6 +503,7 @@ static const struct option long_options[] = { - { "suffix", required_argument, NULL, 'f' }, - { "link-retry", required_argument, NULL, 'l' }, - { "mode", required_argument, NULL, 'm' }, -+ { "link-up", required_argument, NULL, 'u' }, - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, 'v' }, - { NULL, 0, NULL, 0 } -@@ -462,6 +521,7 @@ static void help(int status) - " -f, --suffix Append the suffix to VLAN interface name\n" - " -l, --link-retry Number of retries for link up\n" - " -m, --mode Link mode, either fabric or vn2vn\n" -+ " -u, --link-up Leave link up after FIP response\n" - " -h, --help Display this help and exit\n" - " -v, --version Display version information and exit\n", - exe); -@@ -471,7 +531,7 @@ static void help(int status) - - static void parse_cmdline(int argc, char **argv) - { -- char c; -+ signed char c; - - while (1) { - c = getopt_long(argc, argv, GETOPT_STR, long_options, NULL); -@@ -508,6 +568,9 @@ static void parse_cmdline(int argc, char **argv) - exit(1); - } - break; -+ case 'u': -+ config.link_up = true; -+ break; - case 'h': - help(0); - break; -@@ -539,59 +602,60 @@ static int rtnl_listener_handler(struct nlmsghdr *nh, UNUSED void *arg) - return -1; - } - --static void --create_missing_vlans_list(struct fcf_list_head *list, const char *label) -+static int -+create_and_start_vlan(struct fcf *fcf, bool vn2vn) - { -- struct fcf *fcf; - struct iff *real_dev, *vlan; - char vlan_name[IFNAMSIZ]; - int rc; - -- if (!config.create) -- return; -- -- TAILQ_FOREACH(fcf, list, list_node) { -- real_dev = lookup_iff(fcf->ifindex, NULL); -- if (!real_dev) { -- FIP_LOG_ERR(ENODEV, -- "lost device %d with discovered %s?\n", -- fcf->ifindex, label); -- continue; -- } -- if (!fcf->vlan) { -- /* -- * If the vlan notification has VLAN id 0, -- * skip creating vlan interface, and FCoE is -- * started on the physical interface itself. -- */ -- FIP_LOG_DBG("VLAN id is 0 for %s\n", real_dev->ifname); -- continue; -- } -+ real_dev = lookup_iff(fcf->ifindex, NULL); -+ if (!real_dev) { -+ FIP_LOG_ERR(ENODEV, -+ "lost device %d with discovered %s?\n", -+ fcf->ifindex, vn2vn ? "VN2VN" : "FCF"); -+ return -ENXIO; -+ } -+ if (!fcf->vlan) { -+ /* -+ * If the vlan notification has VLAN id 0, -+ * skip creating vlan interface, and FCoE is -+ * started on the physical interface itself. -+ */ -+ FIP_LOG_DBG("VLAN id is 0 for %s\n", real_dev->ifname); -+ vlan = real_dev; -+ } else { - vlan = lookup_vlan(fcf->ifindex, fcf->vlan); - if (vlan) { - FIP_LOG_DBG("VLAN %s.%d already exists as %s\n", - real_dev->ifname, fcf->vlan, vlan->ifname); -- continue; -+ return 0; - } - snprintf(vlan_name, IFNAMSIZ, "%s.%d%s", - real_dev->ifname, fcf->vlan, config.suffix); - rc = vlan_create(fcf->ifindex, fcf->vlan, vlan_name); -- if (rc < 0) -+ if (rc < 0) { - printf("Failed to create VLAN device %s\n\t%s\n", - vlan_name, strerror(-rc)); -- else -- printf("Created VLAN device %s\n", vlan_name); -- rtnl_set_iff_up(0, vlan_name); -+ return rc; -+ } -+ printf("Created VLAN device %s\n", vlan_name); - } -- printf("\n"); --} -+ if (!config.start) -+ return rc; - --static void create_missing_vlans(void) --{ -- if (!TAILQ_EMPTY(&fcfs)) -- create_missing_vlans_list(&fcfs, "FCF"); -- if (!TAILQ_EMPTY(&vn2vns)) -- create_missing_vlans_list(&vn2vns, "VN2VN"); -+ if (!vlan->running) { -+ FIP_LOG_DBG("%s if %d not running, starting", -+ vlan == real_dev ? "real" : "vlan", -+ vlan->ifindex); -+ rtnl_set_iff_up(vlan->ifindex, NULL); -+ } else if (!vlan->fcoe_started) { -+ printf("Starting FCoE on interface %s\n", -+ vlan->ifname); -+ fcoe_instance_start(vlan->ifname); -+ vlan->fcoe_started = true; -+ } -+ return rc; - } - - static int fcoe_mod_instance_start(const char *ifname) -@@ -666,34 +730,6 @@ static void determine_libfcoe_interface(void) - } - } - --static void start_fcoe(void) --{ -- struct fcf_list_head *head; -- struct fcf *fcf; -- struct iff *iff; -- -- if (config.vn2vn) -- head = &vn2vns; -- else -- head = &fcfs; -- -- TAILQ_FOREACH(fcf, head, list_node) { -- if (fcf->vlan) -- iff = lookup_vlan(fcf->ifindex, fcf->vlan); -- else -- iff = lookup_iff(fcf->ifindex, NULL); -- if (!iff) { -- FIP_LOG_ERR(ENODEV, -- "Cannot start FCoE on VLAN %d, ifindex %d, " -- "because the VLAN device does not exist", -- fcf->vlan, fcf->ifindex); -- continue; -- } -- printf("Starting FCoE on interface %s\n", iff->ifname); -- fcoe_instance_start(iff->ifname); -- } --} -- - static void print_list(struct fcf_list_head *list, const char *label) - { - struct iff *iff; -@@ -749,9 +785,15 @@ static void recv_loop(int timeout) - rtnl_recv(pfd[0].fd, rtnl_listener_handler, NULL); - /* everything else should be FIP packet sockets */ - for (i = 1; i < pfd_len; i++) { -- if (pfd[i].revents & POLLIN) -- fip_recv(pfd[i].fd, fip_vlan_handler, NULL); -+ if (pfd[i].revents & POLLIN) { -+ rc = fip_recv(pfd[i].fd, fip_vlan_handler, -+ NULL); -+ if (rc < 0) -+ break; -+ } - } -+ if (i < pfd_len) -+ break; - } - } - -@@ -763,7 +805,7 @@ static void find_interfaces(int ns) - - static int probe_fip_interface(struct iff *iff) - { -- int origdev = 1; -+ int origdev = 1, rc; - - if (iff->resp_recv) - return 0; -@@ -785,6 +827,10 @@ static int probe_fip_interface(struct iff *iff) - - if (!iff->fip_ready) { - iff->ps = fip_socket(iff->ifindex, FIP_NONE); -+ if (iff->ps < 0) { -+ FIP_LOG_DBG("if %d not ready\n", iff->ifindex); -+ return 0; -+ } - setsockopt(iff->ps, SOL_PACKET, PACKET_ORIGDEV, - &origdev, sizeof(origdev)); - pfd_add(iff->ps); -@@ -792,34 +838,23 @@ static int probe_fip_interface(struct iff *iff) - } - - if (config.vn2vn) -- fip_send_vlan_request(iff->ps, iff->ifindex, iff->mac_addr, -- FIP_ALL_VN2VN); -+ rc = fip_send_vlan_request(iff->ps, iff->ifindex, -+ iff->mac_addr, FIP_ALL_VN2VN); - else -- fip_send_vlan_request(iff->ps, iff->ifindex, iff->mac_addr, -- FIP_ALL_FCF); -- iff->req_sent = true; -- return 0; -+ rc = fip_send_vlan_request(iff->ps, iff->ifindex, -+ iff->mac_addr, FIP_ALL_FCF); -+ if (rc == 0) -+ iff->req_sent = true; -+ return rc == 0 ? 0 : 1; - } - - static int send_vlan_requests(void) - { - struct iff *iff; -- int i; - int skipped = 0; - -- if (config.automode) { -- TAILQ_FOREACH(iff, &interfaces, list_node) { -- skipped += probe_fip_interface(iff); -- } -- } else { -- for (i = 0; i < config.namec; i++) { -- iff = lookup_iff(0, config.namev[i]); -- if (!iff) { -- skipped++; -- continue; -- } -- skipped += probe_fip_interface(iff); -- } -+ TAILQ_FOREACH(iff, &interfaces, list_node) { -+ skipped += probe_fip_interface(iff); - } - return skipped; - } -@@ -829,51 +864,70 @@ static void do_vlan_discovery(void) - struct iff *iff; - int retry_count = 0; - int skip_retry_count = 0; -- int skipped = 0; -+ int skipped = 0, retry_iff = 0; - retry: - skipped += send_vlan_requests(); - if (skipped && skip_retry_count++ < config.link_retry) { -- FIP_LOG_DBG("waiting for IFF_RUNNING [%d]\n", skip_retry_count); -+ FIP_LOG_DBG("waiting for IFF_RUNNING [%d/%d]\n", -+ skip_retry_count, config.link_retry); - recv_loop(500); - skipped = 0; - retry_count = 0; - goto retry; - } - recv_loop(200); -- TAILQ_FOREACH(iff, &interfaces, list_node) -+ TAILQ_FOREACH(iff, &interfaces, list_node) { -+ if (!iff->fip_ready) { -+ FIP_LOG_DBG("if %d: skipping, FIP not ready\n", -+ iff->ifindex); -+ continue; -+ } -+ if (!iff->running && iff->linkup_sent) { -+ FIP_LOG_DBG("if %d: waiting for IFF_RUNNING [%d]\n", -+ iff->ifindex, retry_count); -+ retry_iff++; -+ continue; -+ } - /* if we did not receive a response, retry */ -- if (iff->req_sent && !iff->resp_recv && -- retry_count++ < MAX_VLAN_RETRIES) { -- FIP_LOG_DBG("VLAN discovery RETRY [%d]", retry_count); -- goto retry; -+ if (iff->req_sent && !iff->resp_recv) { -+ FIP_LOG_DBG("if %d: VLAN discovery RETRY [%d]", -+ iff->ifindex, retry_count); -+ iff->req_sent = false; -+ retry_iff++; -+ continue; - } -+ if (config.create) { -+ struct iff *vlan; -+ -+ TAILQ_FOREACH(vlan, &iff->vlans, list_node) { -+ if (!vlan->running) { -+ FIP_LOG_DBG("vlan %d: waiting for " -+ "IFF_RUNNING [%d]", -+ vlan->ifindex, retry_count); -+ retry_iff++; -+ continue; -+ } -+ } -+ } -+ } -+ if (retry_iff && retry_count++ < config.link_retry) { -+ recv_loop(1000); -+ retry_iff = 0; -+ goto retry; -+ } - } - - static void cleanup_interfaces(void) - { - struct iff *iff; -- int i; -- int skipped = 0; - -- if (config.automode) { -- TAILQ_FOREACH(iff, &interfaces, list_node) { -- if (iff->linkup_sent && -- (!iff->running || !iff->req_sent || !iff->resp_recv)) { -- FIP_LOG_DBG("shutdown if %d", -- iff->ifindex); -- rtnl_set_iff_down(iff->ifindex, NULL); -- iff->linkup_sent = false; -- } -- } -- } else { -- for (i = 0; i < config.namec; i++) { -- iff = lookup_iff(0, config.namev[i]); -- if (!iff) { -- skipped++; -+ TAILQ_FOREACH(iff, &interfaces, list_node) { -+ if (iff->linkup_sent) { -+ if (config.link_up && iff->resp_recv) - continue; -- } -- if (iff->linkup_sent && -- (!iff->running || !iff->req_sent || !iff->resp_recv)) { -+ if (iff->fcoe_started) -+ continue; -+ if (TAILQ_EMPTY(&iff->vlans)) { - FIP_LOG_DBG("shutdown if %d", - iff->ifindex); - rtnl_set_iff_down(iff->ifindex, NULL); -@@ -881,8 +935,8 @@ static void cleanup_interfaces(void) - } - } - } -- - } -+ - /* this is to not require headers from libcap */ - static inline int capget(cap_user_header_t hdrp, cap_user_data_t datap) - { -@@ -934,29 +988,24 @@ int main(int argc, char **argv) - determine_libfcoe_interface(); - - find_interfaces(ns); -- while ((TAILQ_EMPTY(&interfaces)) && ++find_cnt < 5) { -- FIP_LOG_DBG("no interfaces found, trying again"); -- find_interfaces(ns); -- } -+ if (config.automode) -+ while ((TAILQ_EMPTY(&interfaces)) && ++find_cnt < 5) { -+ FIP_LOG_DBG("no interfaces found, trying again"); -+ find_interfaces(ns); -+ } - - if (TAILQ_EMPTY(&interfaces)) { -- FIP_LOG_ERR(ENODEV, "no interfaces to perform discovery on"); -+ if (config.automode) -+ FIP_LOG_ERR(ENODEV, -+ "no interfaces to perform discovery on"); -+ else -+ FIP_LOG("no interfaces to perform discovery on"); - exit(1); - } - - do_vlan_discovery(); - - rc = print_results(); -- if (!rc && config.create) { -- create_missing_vlans(); -- /* -- * need to listen for the RTM_NETLINK messages -- * about the new VLAN devices -- */ -- recv_loop(500); -- } -- if (!rc && config.start) -- start_fcoe(); - - cleanup_interfaces(); - -diff --git a/lib/fip.c b/lib/fip.c -index 73bf03e..6657b61 100644 ---- a/lib/fip.c -+++ b/lib/fip.c -@@ -95,10 +95,11 @@ static int fip_get_sanmac(int ifindex, unsigned char *addr) - * @mac: MAC address to add or delete - * @multi: false if unicast, true if multicast address - */ --static void -+static int - fip_socket_add_addr(int s, int ifindex, bool add, const __u8 *mac, bool multi) - { - struct packet_mreq mr; -+ int rc = 0; - - memset(&mr, 0, sizeof(mr)); - mr.mr_ifindex = ifindex; -@@ -107,9 +108,12 @@ fip_socket_add_addr(int s, int ifindex, bool add, const __u8 *mac, bool multi) - memcpy(mr.mr_address, mac, ETHER_ADDR_LEN); - if (setsockopt(s, SOL_PACKET, - add ? PACKET_ADD_MEMBERSHIP : PACKET_DROP_MEMBERSHIP, -- &mr, sizeof(mr)) < 0) -+ &mr, sizeof(mr)) < 0) { - FIP_LOG_DBG("PACKET_%s_MEMBERSHIP:failed\n", - add ? "ADD" : "DROP"); -+ rc = -errno; -+ } -+ return rc; - } - - /** -@@ -118,16 +122,16 @@ fip_socket_add_addr(int s, int ifindex, bool add, const __u8 *mac, bool multi) - * @ifindex: network interface index to send on - * @add: 1 to add 0 to del - */ --static void fip_socket_sanmac(int s, int ifindex, int add) -+static int fip_socket_sanmac(int s, int ifindex, int add) - { - unsigned char smac[ETHER_ADDR_LEN]; - - if (fip_get_sanmac(ifindex, smac)) { - FIP_LOG_DBG("%s: no sanmac, ifindex %d\n", __func__, ifindex); -- return; -+ return -ENXIO; - } - -- fip_socket_add_addr(s, ifindex, add, smac, false); -+ return fip_socket_add_addr(s, ifindex, add, smac, false); - } - - /** -@@ -210,7 +214,11 @@ int fip_socket(int ifindex, enum fip_multi multi) - if (s < 0) - return s; - -- fip_socket_sanmac(s, ifindex, 1); -+ rc = fip_socket_sanmac(s, ifindex, 1); -+ if (rc < 0) { -+ close(s); -+ return rc; -+ } - if (multi != FIP_NONE) - fip_socket_multi(s, ifindex, true, multi); - diff --git a/fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch b/fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch deleted file mode 100644 index 020b428..0000000 --- a/fcoe-utils-1.0.29-pass-flags-to-fcoemon-to-enable-vn2vn-mode.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 50e1aaa1b8b6856a890ae3f036ae9439b24c40c3 Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Fri, 24 Oct 2014 14:36:53 -0700 -Subject: [PATCH] pass flags to fcoemon to enable vn2vn mode - ---- - fcoeadm.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/fcoeadm.c b/fcoeadm.c -index 07ff690..776b4e3 100644 ---- a/fcoeadm.c -+++ b/fcoeadm.c -@@ -286,7 +286,7 @@ int main(int argc, char *argv[]) - } - - ifname = argv[optind]; -- rc = fcoeadm_action(cmd, ifname, CLIF_FLAGS_NONE); -+ rc = fcoeadm_action(cmd, ifname, flags); - break; - case 'r': - cmd = CLIF_RESET_CMD; -@@ -303,8 +303,7 @@ int main(int argc, char *argv[]) - ifname = argv[optind]; - rc = fcoe_validate_fcoe_conn(ifname); - if (!rc) -- rc = fcoeadm_action(cmd, ifname, -- CLIF_FLAGS_NONE); -+ rc = fcoeadm_action(cmd, ifname, flags); - break; - - case 'i': -@@ -405,8 +404,7 @@ int main(int argc, char *argv[]) - rc = display_port_stats(ifname, stat_interval); - break; - case 'p': -- rc = fcoeadm_action(CLIF_PID_CMD, NULL, -- CLIF_FLAGS_NONE); -+ rc = fcoeadm_action(CLIF_PID_CMD, NULL, flags); - break; - - case 'b': --- -1.9.3 - diff --git a/fcoe-utils-ggc7-fmt-truc-err.patch b/fcoe-utils-ggc7-fmt-truc-err.patch new file mode 100644 index 0000000..3de42b4 --- /dev/null +++ b/fcoe-utils-ggc7-fmt-truc-err.patch @@ -0,0 +1,53 @@ +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-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch b/fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch deleted file mode 100644 index 320ecd9..0000000 --- a/fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch +++ /dev/null @@ -1,78 +0,0 @@ -From f3af6bad75d7f6c90b9a170cbf9e4748ab4bb24e Mon Sep 17 00:00:00 2001 -From: Johannes Thumshirn -Date: Mon, 18 May 2015 17:02:59 +0000 -Subject: [PATCH] fcoemon: Rework daemonizing and error handling - -Rework error handling, which leads to daemonizing later in order to get the -error handling into effect. - -Signed-off-by: Johannes Thumshirn -Signed-off-by: Vasu Dev ---- - fcoemon.c | 31 ++++++++++++++++++++++--------- - 1 file changed, 22 insertions(+), 9 deletions(-) - -diff --git a/fcoemon.c b/fcoemon.c -index 3b5210c..c5edd1b 100644 ---- a/fcoemon.c -+++ b/fcoemon.c -@@ -3719,11 +3719,6 @@ int main(int argc, char **argv) - if (argc != optind) - fcm_usage(); - -- if (!fcm_fg && daemon(0, !fcoe_config.use_syslog)) { -- FCM_LOG("Starting daemon failed"); -- exit(EXIT_FAILURE); -- } -- - umask(0); - - /* -@@ -3770,22 +3765,40 @@ int main(int argc, char **argv) - } - - fcm_fcoe_init(); -- fcm_fc_events_init(); -- fcm_link_init(); /* NETLINK_ROUTE protocol */ -+ rc = fcm_fc_events_init(); -+ if (rc != 0) -+ exit(1); -+ -+ rc = fcm_link_init(); /* NETLINK_ROUTE protocol */ -+ if (rc != 0) -+ goto err_cleanup; -+ - fcm_dcbd_init(); -- fcm_srv_create(&srv_info); -+ rc = fcm_srv_create(&srv_info); -+ if (rc != 0) -+ goto err_cleanup; -+ -+ if (!fcm_fg && daemon(0, !fcoe_config.use_syslog)) { -+ FCM_LOG("Starting daemon failed"); -+ goto err_cleanup; -+ } -+ - sa_select_set_callback(fcm_handle_changes); - - rc = sa_select_loop(); - if (rc < 0) { - FCM_LOG_ERR(rc, "select error\n"); -- exit(EXIT_FAILURE); -+ goto err_cleanup; - } - fcm_dcbd_shutdown(); - fcm_srv_destroy(&srv_info); - if (rc == SIGHUP) - fcm_cleanup(); - return 0; -+ -+err_cleanup: -+ fcm_cleanup(); -+ exit(1); - } - - /******************************************************* --- -2.1.0 - diff --git a/fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch b/fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch deleted file mode 100644 index 3af11b9..0000000 --- a/fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 91c0c8c0a37af40b3fb4a37df6490a226348d152 Mon Sep 17 00:00:00 2001 -From: Vasu Dev -Date: Fri, 5 Jun 2015 14:52:10 -0700 -Subject: [PATCH] fcoemon: fix IEEE state machine - -Fix IEEE state machine for these issues:- - - - fcoeadm scan not working - - fcoeadm reset not working - - periodic fipvlan issuance even after fcoe instance created - -These issues are due to current IEEE states are not correctly -handled. The validate_ieee_info() return either activate or -wait actions and out of that only activate is really used to -enable fcoe instance and none other action are applicable in -IEEE state machine, so reduced to only activate and then -advance the state machine to new IEEE_ACTIVE state to allow -processing of scan & reset command once interface activated. - -This also fixes fipvlan issuance issue beside fixing scan and -reset fcoeadm commands. - -Signed-off-by: Vasu Dev -Tested-By: Jack Morgan ---- - fcoemon.c | 19 +++++++------------ - fcoemon.h | 1 + - 2 files changed, 8 insertions(+), 12 deletions(-) - -diff --git a/fcoemon.c b/fcoemon.c -index c5edd1b..c0af99b 100644 ---- a/fcoemon.c -+++ b/fcoemon.c -@@ -1341,6 +1341,7 @@ STR_ARR(ieee_states, "Unknown", "Out of range", - [IEEE_INIT] = "IEEE_INIT", - [IEEE_GET_STATE] = "IEEE_GET_STATE", - [IEEE_DONE] = "IEEE_DONE", -+ [IEEE_ACTIVE] = "IEEE_ACTIVE", - ); - - static void -@@ -3054,20 +3055,14 @@ static void fcm_netif_ieee_advance(struct fcm_netif *ff) - break; - case IEEE_DONE: - action = validate_ieee_info(ff); -- switch (action) { -- case FCP_DESTROY_IF: -- case FCP_ENABLE_IF: -- case FCP_ACTIVATE_IF: -+ if (action == FCP_ACTIVATE_IF) { - fcp_action_set(ff->ifname, action); -- break; -- case FCP_DISABLE_IF: -- case FCP_ERROR: -- fcp_action_set(ff->ifname, FCP_DISABLE_IF); -- break; -- case FCP_WAIT: -- default: -- break; -+ ieee_state_set(ff, IEEE_ACTIVE); - } -+ break; -+ case IEEE_ACTIVE: -+ /* TBD enable and disable if needed in IEEE mode */ -+ break; - default: - break; - } -diff --git a/fcoemon.h b/fcoemon.h -index c2ed7b1..3869bae 100644 ---- a/fcoemon.h -+++ b/fcoemon.h -@@ -80,6 +80,7 @@ enum ieee_state { - IEEE_INIT = 0, /* Starting state */ - IEEE_GET_STATE, /* Getting IEEE DCB state */ - IEEE_DONE, /* Received IEEE DCB state */ -+ IEEE_ACTIVE, /* IEEE is in ACTIVE state */ - IEEE_ERROR, /* Error receiving IEEE DCB state */ - }; - --- -2.1.0 - diff --git a/fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch b/fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch deleted file mode 100644 index 67c583e..0000000 --- a/fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8065e01707c3306380c684712e547fcf0e4e55da Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Thu, 5 Feb 2015 11:46:31 -0800 -Subject: [PATCH] sanmac isn't required - -Signed-off-by: Chris Leech ---- - lib/fip.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/fip.c b/lib/fip.c -index 6657b61..5e5b179 100644 ---- a/lib/fip.c -+++ b/lib/fip.c -@@ -215,7 +215,7 @@ int fip_socket(int ifindex, enum fip_multi multi) - return s; - - rc = fip_socket_sanmac(s, ifindex, 1); -- if (rc < 0) { -+ if (rc < 0 && rc != -ENXIO) { - close(s); - return rc; - } --- -2.1.0 - diff --git a/fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch b/fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch deleted file mode 100644 index 92d7800..0000000 --- a/fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cc0037c0091a2b9baf04a5101ec83a6ec8db448b Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Mon, 6 Jul 2015 20:43:56 -0700 -Subject: [PATCH] fcoeadm: fix display when some netdevs don't have serial - numbers - ---- - fcoeadm_display.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/fcoeadm_display.c b/fcoeadm_display.c -index 9b96170..3b7fff9 100644 ---- a/fcoeadm_display.c -+++ b/fcoeadm_display.c -@@ -1294,9 +1294,8 @@ enum fcoe_status display_adapter_info(const char *ifname) - continue; - } - -- if (!strncmp(hba_attrs->SerialNumber, -- shba_attrs->SerialNumber, -- strlen(hba_attrs->SerialNumber))) { -+ if (!strcmp(hba_attrs->SerialNumber, -+ shba_attrs->SerialNumber)) { - show_port_info(sport_attrs); - hba_table_list->hba_table[j].displayed = 1; - } --- -2.1.0 - diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 2185e0c..c6f14a5 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,34 +1,29 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags %global _hardened_build 1 -%global checkout 91c0c8c +%global checkout f5cbb9a Name: fcoe-utils -Version: 1.0.30 -Release: 5.git%{checkout}%{?dist} +Version: 1.0.32 +Release: 1%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 URL: http://www.open-fcoe.org # git://open-fcoe.org/fcoe/fcoe-utils.git -Source0: %{name}-%{version}.tar.gz +Source0: https://github.com/morbidrsa/fcoe-utils/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: quickstart.txt Source2: fcoe.service Source3: fcoe.config ExcludeArch: ppc s390 -Patch1: fcoe-utils-v1.0.30-1-fcoemon-Rework-daemonizing-and-error-handling.patch -Patch2: fcoe-utils-v1.0.30-2-fcoemon-fix-IEEE-state-machine.patch -Patch3: fcoe-utils-v1.0.30-3-sanmac-isn-t-required.patch -Patch4: fcoe-utils-v1.0.30-fcoeadm-fix-display-when-some-netdevs-don-t-have-ser.patch +Patch0: fcoe-utils-ggc7-fmt-truc-err.patch BuildRequires: autoconf BuildRequires: automake -BuildRequires: libhbaapi-devel >= 2.2.9-6 -BuildRequires: libhbalinux-devel >= 1.0.17-1 +BuildRequires: libpciaccess-devel BuildRequires: libtool BuildRequires: lldpad-devel >= 0.9.43 BuildRequires: systemd Requires: lldpad >= 0.9.43 -Requires: libhbalinux >= 1.0.16-5 Requires: iproute Requires: device-mapper-multipath Requires(post): systemd @@ -86,6 +81,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Thu Feb 09 2017 Chris Leech - 1.0.32-1 +- update to 1.0.32 + * Wed Feb 03 2016 Fedora Release Engineering - 1.0.30-5.git91c0c8c - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index a15b7e8..54a1ef9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6fcbb0e06a2af0bc1f2f5453d1042eaf fcoe-utils-1.0.30.tar.gz +SHA512 (fcoe-utils-1.0.32.tar.gz) = 45b4ba5618f6d7a99ac206a158b4abd38201f0b29c46601a9f70425ae2610fb2688db5b276ef835699e71eeba1db65cc88e76e45cbc645d5f846ef6032a08874 From 94337fd90b963d9b2a7d0a54e09d40ec88e0d17d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 08:07:39 +0000 Subject: [PATCH 09/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index c6f14a5..840a7f0 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -81,6 +81,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.0.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Feb 09 2017 Chris Leech - 1.0.32-1 - update to 1.0.32 From db83516fb48ede8a0ad386ae42dca201897dd095 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 20:30:23 +0000 Subject: [PATCH 10/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 840a7f0..2e26564 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -81,6 +81,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.0.32-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.0.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 60da88fefe10e88e3b60da298ecbae5d400cf2eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 09:21:13 +0000 Subject: [PATCH 11/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 2e26564..299f0f1 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -81,6 +81,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.0.32-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 1.0.32-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From d3a175ffc06f757b17118be7626aff43b57eb1be Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Fri, 16 Mar 2018 10:38:13 -0700 Subject: [PATCH 12/49] fix gcc8 -Werror format truncation build issues --- fcoe-utils-ggc8-fmt-truc-err.patch | 130 +++++++++++++++++++++++++++++ fcoe-utils.spec | 6 +- 2 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 fcoe-utils-ggc8-fmt-truc-err.patch diff --git a/fcoe-utils-ggc8-fmt-truc-err.patch b/fcoe-utils-ggc8-fmt-truc-err.patch new file mode 100644 index 0000000..29850ec --- /dev/null +++ b/fcoe-utils-ggc8-fmt-truc-err.patch @@ -0,0 +1,130 @@ +From: Chris Leech +Subject: fix build warnings/errors with GCC format-truncation checks + +Bugzilla: ZZZ +Upstream Status: +Build Info: XXX +Tested: + +commit 9d8c43e3e81752906f4fc58fa656a98bafa1d4a1 +Author: Chris Leech +Date: Fri Mar 16 09:48:26 2018 -0700 + + 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 299f0f1..91309f2 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -17,6 +17,7 @@ Source2: fcoe.service Source3: fcoe.config ExcludeArch: ppc s390 Patch0: fcoe-utils-ggc7-fmt-truc-err.patch +Patch1: fcoe-utils-ggc8-fmt-truc-err.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libpciaccess-devel @@ -81,6 +82,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Fri Mar 16 2018 Chris Leech - 1.0.32-5 +- fix some newer gcc 8 truncation format errors + * Wed Feb 07 2018 Fedora Release Engineering - 1.0.32-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6631a81547845d8831356a7c9bf9d7f7ecf7b7e3 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Fri, 16 Mar 2018 10:38:13 -0700 Subject: [PATCH 13/49] fix gcc8 -Werror format truncation build issues --- ...atch => fcoe-utils-gcc7-fmt-truc-err.patch | 0 fcoe-utils-gcc8-fmt-truc-err.patch | 119 ++++++++++++++++++ fcoe-utils.spec | 8 +- 3 files changed, 125 insertions(+), 2 deletions(-) rename fcoe-utils-ggc7-fmt-truc-err.patch => fcoe-utils-gcc7-fmt-truc-err.patch (100%) create mode 100644 fcoe-utils-gcc8-fmt-truc-err.patch diff --git a/fcoe-utils-ggc7-fmt-truc-err.patch b/fcoe-utils-gcc7-fmt-truc-err.patch similarity index 100% rename from fcoe-utils-ggc7-fmt-truc-err.patch rename to fcoe-utils-gcc7-fmt-truc-err.patch diff --git a/fcoe-utils-gcc8-fmt-truc-err.patch b/fcoe-utils-gcc8-fmt-truc-err.patch new file mode 100644 index 0000000..d7602b0 --- /dev/null +++ b/fcoe-utils-gcc8-fmt-truc-err.patch @@ -0,0 +1,119 @@ +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 299f0f1..c6594f1 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -16,7 +16,8 @@ Source1: quickstart.txt Source2: fcoe.service Source3: fcoe.config ExcludeArch: ppc s390 -Patch0: fcoe-utils-ggc7-fmt-truc-err.patch +Patch0: fcoe-utils-gcc7-fmt-truc-err.patch +Patch1: fcoe-utils-gcc8-fmt-truc-err.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libpciaccess-devel @@ -81,6 +82,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Fri Mar 16 2018 Chris Leech - 1.0.32-5 +- fix some newer gcc 8 truncation format errors + * Wed Feb 07 2018 Fedora Release Engineering - 1.0.32-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b6751fbcf016a9a87825c4ed8bcb04d7e6cd0c90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:23:57 +0000 Subject: [PATCH 14/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 c6594f1..9a8a2cf 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -82,6 +82,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.32-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Mar 16 2018 Chris Leech - 1.0.32-5 - fix some newer gcc 8 truncation format errors From c8542b7eb3a19789221584b2ffd62f08af282c3a Mon Sep 17 00:00:00 2001 From: rasibley Date: Fri, 3 Aug 2018 11:42:55 -0400 Subject: [PATCH 15/49] Initial commit for fcoe-utils santiy test --- tests/README.md | 3 + tests/sanity/LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++ tests/sanity/PURPOSE | 2 + tests/sanity/main.sh | 29 ++ tests/sanity/runtest.sh | 16 + tests/sanity/tc.sh | 233 ++++++++++++++ tests/tests.yml | 15 + 7 files changed, 972 insertions(+) create mode 100644 tests/README.md create mode 100644 tests/sanity/LICENSE create mode 100644 tests/sanity/PURPOSE create mode 100755 tests/sanity/main.sh create mode 100755 tests/sanity/runtest.sh create mode 100755 tests/sanity/tc.sh create mode 100644 tests/tests.yml diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 0000000..ce04773 --- /dev/null +++ b/tests/README.md @@ -0,0 +1,3 @@ +# fcoe-utils + +This is the sanity testing on package of fcoe-utils, since sw fcoe testing requires the san environment, I just do sanity check on the package installation and important information inside of it. diff --git a/tests/sanity/LICENSE b/tests/sanity/LICENSE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/tests/sanity/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/tests/sanity/PURPOSE b/tests/sanity/PURPOSE new file mode 100644 index 0000000..3ac049e --- /dev/null +++ b/tests/sanity/PURPOSE @@ -0,0 +1,2 @@ +PURPOSE of /kernel/storage/sw_fcoe/sanity +This test sanity for fcoe-utils package diff --git a/tests/sanity/main.sh b/tests/sanity/main.sh new file mode 100755 index 0000000..932618c --- /dev/null +++ b/tests/sanity/main.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# Copyright (c) 2016 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# Author: Xiaonan He +ls +#set -x +source tc.sh || exit 200 +yum update -y fcoe-utils +if [ $? -ne 0 ];then + exit 1 +fi + +tlog "running $0" +trun "yum info fcoe-utils" +trun "uname -a" +tok "[[ -f /usr/sbin/fipvlan ]]" +tend diff --git a/tests/sanity/runtest.sh b/tests/sanity/runtest.sh new file mode 100755 index 0000000..0066330 --- /dev/null +++ b/tests/sanity/runtest.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# Copyright (c) 2006 Red Hat, Inc. This copyrighted material +# is made available to anyone wishing to use, modify, copy, or +# redistribute it subject to the terms and conditions of the GNU General +# Public License v.2. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Author: Xiaonan He +rhts-run-simple-test sanity_check "./main.sh" diff --git a/tests/sanity/tc.sh b/tests/sanity/tc.sh new file mode 100755 index 0000000..d54cd63 --- /dev/null +++ b/tests/sanity/tc.sh @@ -0,0 +1,233 @@ +#!/bin/bash +# Copyright (c) 2016 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +#test x$LXT_TC = x || return +#LXT_TC=1 +# +# print the current date +# usage: d=$(tdate) +# +tdate () +{ + date '+%T' 2>/dev/null +} +# +# print the log information +# usage: tlog "hello world" "WARNING" +# +tlog () +{ + local msg=$1 + local log_level=${2:-INFO} + local cur_date=$(tdate) + echo "[$log_level][$cur_date]$msg" + + return 0 +} +# +# run the cmd and format the log. return the exitint status of cmd +# use the global variables: tSTDOUT and tSTDERR to return the stdout and stderr +# usage: trun "ls" +# trun "ls"; echo $? +# stdout=$tSTDOUT +# stderr=$tSTDERR +# +trun () +{ + local cmd="$*" + + _trun_ "$cmd" +} +# +# verify the execution of command +# if the cmd return 0, mark this checkpoint failed and return 1 +# if not, mark it passed and return 0 +# usage: tnot "ls /not_existing" +# +tnot () { + local cmd="$*" + _trun_ "$cmd" 1 + if test $? -eq 0; then + tfail_ "$cmd" ; + else + tpass_ "$cmd" ; + fi +} +# +# verify the execution of command +# if the cmd return 0, mark this checkpoint passed and return 0 +# if not, mark it failed and return 1 +# usage: tok "ls /" +# +tok () +{ + local cmd="$*" + _trun_ "$cmd" 0 + if test $? -eq 0; then + tpass_ "$cmd" ; + else + tfail_ "$cmd" ; + fi +} +# +# verify the execution of command +# if the cmd return 0, mark this checkpoint passed and return 0 +# if not, mark it failes and exit +# usage: terr "ls" +# +#terr () +#{ +# tok "$*" || tend +#} +# +# verify the execution of command +# if the cmd return 0, will continue to run the script +# if not, mark it failes and exit +# usage: terr "ls" +# +terr () +{ + local cmd="$*" + _trun_ "$cmd" 0 + if test $? -ne 0; then + tfail_ "$cmd" ; + tend ; + fi +} +# +# exit the program and print the log message +# usage: texit "error message" 100 +# similar to the exception +# +texit () +{ + msg=$1 + err=$2 + is_null $err && err=1 + test $err -lt 1 || err=1 + tlog "$msg" "ERROR" + exit $2 +} +# +# print the test report, cleanup the testing bed and close the testing. +# usage: tend +# +tend () +{ + local pcount=$(wc -l $tPASS_FILE | awk '{print $1}') + local fcount=$(wc -l $tFAIL_FILE | awk '{print $1}') + local total=$(( $pcount + $fcount )) + echo "#################################Test Report###############################" + echo "TOTAL : $total" + echo "PASSED : $pcount" + echo "FAILED : $fcount" + cat $tPASS_FILE $tFAIL_FILE + echo "###########################End of running $0########################" +#cleanup + rm -f $tPASS_FILE $tFAIL_FILE $tRETURN_FILE $tSTDERR_FILE +# rm -rf $LXT_TMP_DIR + if [[ $pcount -eq 0 ]] && [[ $total -eq 0 ]];then + exit 0 + fi + test $pcount -eq 0 && exit 1 + test $pcount -eq $total && exit 0 + exit 1 +} +# +# private function +# +# +# print the error message and call stack. return 1 +# +tfail_ () +{ + local msg=$* + tlog "$msg" "ERROR" >>$tFAIL_FILE + return 1 +} +# +# print the sucessful message. return 0 +# +tpass_ () +{ + local msg=$* + tlog "$msg" "PASS" >> $tPASS_FILE + return 0 +} +_trun_ () +{ + local cmd="$1" + local chk="$2" + local cur_date=$(tdate) + local stdout=$(eval "$cmd" 2>$tSTDERR_FILE; echo $? >$tRETURN_FILE 2>/dev/null) +#timeout -- how to set timeout? + local exit_status=$(< $tRETURN_FILE) + local stderr=$(< $tSTDERR_FILE) + local msg=CMD +#tnot + if test x$chk = x1; then + test $exit_status -eq 0 || msg=PASS + test $exit_status -eq 0 && msg=FAIL +#should let the tester know this is the negative testing +#if cmd return 0 we will return 1 and vice versa + cmd="[NOT] $cmd" + fi +#tok + if test x$chk = x0; then + test $exit_status -eq 0 && msg=PASS + test $exit_status -eq 0 || msg=FAIL + fi + tSTDOUT=$stdout + tSTDERR=$stderr + test $tIGNORE_STDOUT -eq 1 && stdout='redirect the stdout to /dev/null' + test $tIGNORE_STDERR -eq 1 && stderr='redirect the stderr to /dev/null' + echo "[$msg][$cur_date][$HOSTNAME]$cmd" + echo "STDOUT:" + test "x$stdout" = x || echo "$stdout" + echo "STDERR:$stderr" + echo "RETURN:$exit_status" + echo + return $exit_status +} +# +# setup the testing environment +# +_tsetup_ () +{ + LXT_TMP_DIR="/mnt/testarea/lxt"; + test -z "$HOSTNAME" && HOSTNAME=$(hostname) + test -d "$LXT_TMP_DIR" || mkdir -p "$LXT_TMP_DIR" >& /dev/null || exit 1 + tSTDERR_FILE="$LXT_TMP_DIR/stderr.$$" + test -e "$tSTDERR_FILE" || > "$tSTDERR_FILE" || exit 1 + tRETURN_FILE="$LXT_TMP_DIR/return.$$" + test -e "$tRETURN_FILE" || > "$tRETURN_FILE" || exit 1 + tPASS_FILE="$LXT_TMP_DIR/tc.pass.$$" + test -e "$tPASS_FILE" || > "$tPASS_FILE" || exit 1 + tFAIL_FILE="$LXT_TMP_DIR/tc.fail.$$" + test -e "$tFAIL_FILE" || > "$tFAIL_FILE" || exit 1 +} +# +# main +# +# global variables +tIGNORE_STDOUT=0 +tIGNORE_STDERR=0 +tSTDOUT= +tSTDERR= +#LXT_TMP_DIR +# only used in this file +tPASS_FILE= +tFAIL_FILE= +_tsetup_ diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..31fdc65 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,15 @@ +--- +# No tests suitable for container environment +# No tests suitable for atomic environment +# +# Tests suitable for classic environment +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + tests: + - sanity + required_packages: + - fcoe-utils + - libselinux-python From 3f4e1b27646b2f03184b842046978f71ea88fab2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:44 +0100 Subject: [PATCH 16/49] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- fcoe-utils.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 9a8a2cf..6b65558 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,6 @@ Name: fcoe-utils Version: 1.0.32 Release: 6%{?dist} Summary: Fibre Channel over Ethernet utilities -Group: Applications/System License: GPLv2 URL: http://www.open-fcoe.org # git://open-fcoe.org/fcoe/fcoe-utils.git From 0028fec45868e7a5849aebb351adea4de73a9557 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 19:26:49 +0000 Subject: [PATCH 17/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 6b65558..7ccd420 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -5,7 +5,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -81,6 +81,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.0.32-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.0.32-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From cec212f8f078d51f591b0b50a607e0af0bbb27e6 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Tue, 4 Jun 2019 09:40:44 -0700 Subject: [PATCH 18/49] fix more string function issues breaking the build with newer gcc --- 0001-string-warning-fixes.patch | 490 ++++++++++++++++++++++++++++++++ fcoe-utils.spec | 18 +- sources | 2 +- 3 files changed, 502 insertions(+), 8 deletions(-) create mode 100644 0001-string-warning-fixes.patch diff --git a/0001-string-warning-fixes.patch b/0001-string-warning-fixes.patch new file mode 100644 index 0000000..8128ee1 --- /dev/null +++ b/0001-string-warning-fixes.patch @@ -0,0 +1,490 @@ +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/fcoe-utils.spec b/fcoe-utils.spec index 7ccd420..43fe183 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,28 +1,29 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags %global _hardened_build 1 -%global checkout f5cbb9a +# v1.0.32-3-g9834b340d82 +%global commit0 9834b340d8289bab48d961b6bb2698bab1f3965f +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: fcoe-utils Version: 1.0.32 -Release: 7%{?dist} +Release: 8.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org -# git://open-fcoe.org/fcoe/fcoe-utils.git -Source0: https://github.com/morbidrsa/fcoe-utils/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/morbidrsa/fcoe-utils/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tar.gz Source1: quickstart.txt Source2: fcoe.service Source3: fcoe.config ExcludeArch: ppc s390 -Patch0: fcoe-utils-gcc7-fmt-truc-err.patch -Patch1: fcoe-utils-gcc8-fmt-truc-err.patch +Patch0: 0001-string-warning-fixes.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libpciaccess-devel BuildRequires: libtool BuildRequires: lldpad-devel >= 0.9.43 BuildRequires: systemd +BuildRequires: libbsd-devel Requires: lldpad >= 0.9.43 Requires: iproute Requires: device-mapper-multipath @@ -36,7 +37,7 @@ fcoeadm - command line tool for configuring FCoE interfaces fcoemon - service to configure DCB Ethernet QOS filters, works with lldpad %prep -%autosetup -p1 +%autosetup -p1 -n fcoe-utils-%{commit0} cp -v %{SOURCE1} quickstart.txt %build @@ -81,6 +82,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config %{_libexecdir}/fcoe/ %changelog +* Tue Jun 04 2019 Chris Leech - 1.0.32-8.git9834b34 +- fix more string function issues breaking the build with newer gcc + * Thu Jan 31 2019 Fedora Release Engineering - 1.0.32-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 54a1ef9..27a86c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fcoe-utils-1.0.32.tar.gz) = 45b4ba5618f6d7a99ac206a158b4abd38201f0b29c46601a9f70425ae2610fb2688db5b276ef835699e71eeba1db65cc88e76e45cbc645d5f846ef6032a08874 +SHA512 (fcoe-utils-1.0.32-9834b34.tar.gz) = bbe9af0b277fd1b5e0a14b5865fdaa5812142cce33a2440a9ecf44e0607a4284d1a3402c72b4a3408f5aa87dafbb19de9c22f3a45cc35d092901475f9cddcc0a From 12305bb8ed2a7063413ff3f3bce04b3b45ddce98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 00:18:34 +0000 Subject: [PATCH 19/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 43fe183..a38036a 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.32 -Release: 8.git%{shortcommit0}%{?dist} +Release: 9.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 +* Thu Jul 25 2019 Fedora Release Engineering - 1.0.32-9.git9834b34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 04 2019 Chris Leech - 1.0.32-8.git9834b34 - fix more string function issues breaking the build with newer gcc From a986bb3996ffd79af8f53fb25a3e929d86579614 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 18:14:40 +0000 Subject: [PATCH 20/49] - 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 21/49] - 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 22/49] - 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 23/49] 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 24/49] 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 25/49] - 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 26/49] 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 27/49] 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 28/49] 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 29/49] - 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 30/49] 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 31/49] 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 32/49] 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 33/49] 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 34/49] - 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 35/49] - 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 36/49] 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 37/49] 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 38/49] 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 39/49] 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 40/49] 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 41/49] 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 42/49] 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 43/49] 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 44/49] 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 45/49] 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 46/49] 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 47/49] 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 48/49] 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 49/49] 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