diff --git a/backport-00-Revert_Make_gcc_compiler_happy_about_ifname_string.patch b/backport-00-Revert_Make_gcc_compiler_happy_about_ifname_string.patch
new file mode 100644
index 0000000000000000000000000000000000000000..026bbe2e323c718303f294dda2ac36f975cc9076
--- /dev/null
+++ b/backport-00-Revert_Make_gcc_compiler_happy_about_ifname_string.patch
@@ -0,0 +1,75 @@
+From 1e6837c8ce063399eeb9580104da33f807e15443 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Tue, 23 Mar 2021 11:16:06 -0700
+Subject: [PATCH] Revert "Make gcc compiler happy about ifname string
+ truncation."
+
+This change dropped the "." from between the physical interface name and
+the vlan number, making fipvlan created vlan names incompatible with
+fcoeadm commands that ended up calling get_pci_dev_from_netdev in
+lib/sysfs_hba.c (fcoeadm -i). That requirement should be fixed, but for
+now lets deal with the fipvlan naming regression.
+
+safe_makevlan_name isn't doing anything that can't be handled by
+checking the return from snprintf
+
+This reverts commit eee875e6526786031ec916274deec92148677c38.
+
+Signed-off-by: Chris Leech <cleech@redhat.com>
+---
+ fipvlan.c | 34 +---------------------------------
+ 1 file changed, 1 insertion(+), 33 deletions(-)
+
+diff --git a/fipvlan.c b/fipvlan.c
+index c8a07339314..fe8d7955cc5 100644
+--- a/fipvlan.c
++++ b/fipvlan.c
+@@ -595,36 +595,6 @@ static int rtnl_listener_handler(struct nlmsghdr *nh, UNUSED void *arg)
+ 	return -1;
+ }
+ 
+-static int
+-safe_makevlan_name(char *vlan_name, size_t vsz,
+-		char *ifname, int vlan_num, char *suffix)
+-{
+-	size_t ifsz = strlen(ifname);
+-	size_t susz = strlen(suffix);	/* should never be NULL */
+-	int nusz;
+-	char numbuf[16];
+-	char *cp = vlan_name;
+-
+-	nusz = snprintf(numbuf, sizeof(numbuf), "%d", vlan_num);
+-
+-	if ((ifsz + susz + nusz + 2) > vsz) {
+-		FIP_LOG_ERR(EINVAL,
+-			"Cannot make VLAN name from ifname=\"%s\", vlan %d, and suffix=\"%s\"\n",
+-			ifname, vlan_num, suffix);
+-		return -EINVAL;
+-	}
+-	memcpy(cp, ifname, ifsz);
+-	cp += ifsz;
+-	memcpy(cp, numbuf, nusz);
+-	cp += nusz;
+-	if (susz > 0) {
+-		memcpy(cp, suffix, susz);
+-		cp += susz;
+-	}
+-	*cp = '\0';
+-	return 0;
+-}
+-
+ static int
+ create_and_start_vlan(struct fcf *fcf, bool vn2vn)
+ {
+@@ -654,10 +624,8 @@ create_and_start_vlan(struct fcf *fcf, bool vn2vn)
+ 				    real_dev->ifname, fcf->vlan, vlan->ifname);
+ 			rc = 0;
+ 		} else {
+-			rc = safe_makevlan_name(vlan_name, sizeof(vlan_name),
++			snprintf(vlan_name, IFNAMSIZ, "%s.%d%s",
+ 				 real_dev->ifname, fcf->vlan, config.suffix);
+-			if (rc < 0)
+-				return rc;
+ 			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/backport-01-fix_VLAN_device_name_overflow_check.patch b/backport-01-fix_VLAN_device_name_overflow_check.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9ce9f60103bd31fac42e96f33b0574824850dbb5
--- /dev/null
+++ b/backport-01-fix_VLAN_device_name_overflow_check.patch
@@ -0,0 +1,35 @@
+From b9885692cb283a674e04528486984fb61f92a190 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Tue, 23 Mar 2021 11:21:17 -0700
+Subject: [PATCH] fix VLAN device name overflow check
+
+check snprintf return for truncation
+
+Signed-off-by: Chris Leech <cleech@redhat.com>
+---
+ fipvlan.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/fipvlan.c b/fipvlan.c
+index fe8d7955cc5..3ce913d5eaf 100644
+--- a/fipvlan.c
++++ b/fipvlan.c
+@@ -624,8 +624,16 @@ 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 < 0 || rc >= IFNAMSIZ) {
++				printf("Failed to create VLAN device "
++					"(name %s.%d%s is too long)\n",
++					real_dev->ifname, fcf->vlan,
++					config.suffix);
++				return -EINVAL;
++			}
+ 			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/backport-02-string_op_truncation_format_trauncation.patch b/backport-02-string_op_truncation_format_trauncation.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4b3e074d9497fa17e874d1221a7fc3c53cd48494
--- /dev/null
+++ b/backport-02-string_op_truncation_format_trauncation.patch
@@ -0,0 +1,441 @@
+From 329d7721a40e94547186bf680ba5ae033dda3006 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Fri, 18 Sep 2020 10:20:57 -0700
+Subject: [PATCH] 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 <cleech@redhat.com>
+---
+ 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, //30yuan ma wu gai han shu 
+ 	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)wl_vports
+ 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));
+ 
diff --git a/backport-03-use-of-uninitialized-values-detected-during-LTO.patch b/backport-03-use-of-uninitialized-values-detected-during-LTO.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8cc3fb1eb7b6c12cf6ef5db6917976e6daab7a74
--- /dev/null
+++ b/backport-03-use-of-uninitialized-values-detected-during-LTO.patch
@@ -0,0 +1,50 @@
+From 64254aee4509192831b9f9cf695abd81a9656f00 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+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 <cleech@redhat.com>
+---
+ 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-1.0.32.tar.gz b/fcoe-utils-1.0.32.tar.gz
deleted file mode 100644
index d49eaa046f3371c80497c104600ac72a1a18e694..0000000000000000000000000000000000000000
Binary files a/fcoe-utils-1.0.32.tar.gz and /dev/null differ
diff --git a/fcoe-utils-1.0.33.tar.gz b/fcoe-utils-1.0.33.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c7c434d196cda700b6b2792b68290804a54eb7dc
Binary files /dev/null and b/fcoe-utils-1.0.33.tar.gz differ
diff --git a/fcoe-utils-fix-gcc9-build-error.patch b/fcoe-utils-fix-gcc9-build-error.patch
deleted file mode 100644
index 8461f7bc05e067fdd24295593f9a14f20238422a..0000000000000000000000000000000000000000
--- a/fcoe-utils-fix-gcc9-build-error.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff --git a/fcoeadm.c b/fcoeadm.c
-index 776b4e3..20b01b3 100644
---- a/fcoeadm.c
-+++ b/fcoeadm.c
-@@ -185,8 +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));
-+	if (ifname) {
-+		strncpy(data.ifname, ifname, sizeof(data.ifname) - 1);
-+		data.ifname[sizeof(data.ifname) - 1] = '\0';
-+	}
- 	else
- 		data.ifname[0] = '\0';
- 	data.cmd = cmd;
-@@ -231,7 +233,8 @@ 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));
-+	strncpy(progname, basename(argv[0]), sizeof(progname) - 1);
-+	progname[sizeof(progname) - 1] = '\0';
- 
- 	/* check if we have sysfs */
- 	if (fcoe_checkdir(SYSFS_MOUNT)) {
-diff --git a/fcoemon.c b/fcoemon.c
-index 9a400c5..9572836 100644
---- a/fcoemon.c
-+++ b/fcoemon.c
-@@ -518,8 +518,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));
-+		snprintf(file, sizeof(file), "%s/%.*s", CONFIG_DIR,
-+			(int)(sizeof(file) - strlen(CONFIG_DIR) - 2), dp->d_name);
- 		fp = fopen(file, "r");
- 		if (!fp) {
- 			FCM_LOG_ERR(errno, "Failed to read %s\n", file);
-@@ -1089,9 +1089,12 @@ 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);
--	if (ioctl(fd, SIOCGIFVLAN, &ifv) == 0)
--		strncpy(real_ifname, ifv.u.device2, strlen(ifv.u.device2)+1);
-+	strncpy(ifv.device1, vlan_ifname, sizeof(ifv.device1) - 1);
-+	ifv.device1[sizeof(ifv.device1) - 1] = '\0';
-+	if (ioctl(fd, SIOCGIFVLAN, &ifv) == 0) {
-+		strncpy(real_ifname, ifv.u.device2, IFNAMSIZ - 1);
-+		real_ifname[IFNAMSIZ - 1] = '\0';
-+	}
- 	close(fd);
- }
- 
-@@ -1642,8 +1645,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, strlen(real_dev)+1);
-+		if (strlen(real_dev)) {
-+			strncpy(p->real_ifname, real_dev, sizeof(p->real_ifname) - 1);
-+			p->real_ifname[sizeof(p->real_ifname) - 1] = '\0';
-+		}
- 		if (p->ready)
- 			update_fcoe_port_state(p, type, operstate,
- 					       FCP_CFG_IFNAME);
-@@ -1655,7 +1660,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, strlen(ifname)+1);
-+			strncpy(p->real_ifname, ifname, sizeof(p->real_ifname) - 1);
-+			p->real_ifname[sizeof(p->real_ifname) - 1] = '\0';
- 			update_fcoe_port_state(p, type, operstate,
- 					       FCP_REAL_IFNAME);
- 		}
-@@ -1783,7 +1789,8 @@ 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), sizeof(ifname) - 1);
-+	ifname[sizeof(ifname) - 1] = '\0';
- 	ff = fcm_netif_lookup_create(ifname);
- 	if (!ff) {
- 		FCM_LOG("Processing IEEE message: %s not found or created\n",
-@@ -3704,7 +3711,8 @@ int main(int argc, char **argv)
- 
- 	memset(&fcoe_config, 0, sizeof(fcoe_config));
- 
--	strncpy(progname, basename(argv[0]), sizeof(progname));
-+	strncpy(progname, basename(argv[0]), sizeof(progname) - 1);
-+	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 7c00c7c..7dec0df 100644
---- a/fipvlan.c
-+++ b/fipvlan.c
-@@ -448,7 +448,8 @@ 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);
-+	strncpy(iff->ifname, RTA_DATA(ifla[IFLA_IFNAME]), IFNAMSIZ - 1);
-+	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))
--				strncpy(config.suffix, optarg, 256);
-+			if (optarg && strlen(optarg)) {
-+				strncpy(config.suffix, optarg, 255);
-+				config.suffix[255] = '0';
-+			}
- 			break;
- 		case 'l':
- 			config.link_retry = strtoul(optarg, NULL, 10);
-diff --git a/lib/sysfs_hba.c b/lib/sysfs_hba.c
-index 5cb7fd3..9892c3d 100644
---- a/lib/sysfs_hba.c
-+++ b/lib/sysfs_hba.c
-@@ -255,10 +255,12 @@ static void get_module_info(const char *pcidev, struct hba_info *info)
- 
- 	buf[err] = '\0';
- 
--	if (strstr(buf, "module"))
-+	if (strstr(buf, "module")) {
- 		strncpy(info->driver_name,
- 			strstr(buf, "module") + strlen("module") + 1,
--			sizeof(info->driver_name));
-+			sizeof(info->driver_name) - 1);
-+		info->driver_name[sizeof(info->driver_name) - 1] = '\0';
-+	}
- 
- }
- 
-@@ -315,7 +317,8 @@ struct port_attributes *get_rport_attribs(const char *rport)
- 	if (!pa)
- 		goto free_path;
- 
--	strncpy(pa->device_name, rport, sizeof(pa->device_name));
-+	strncpy(pa->device_name, rport, sizeof(pa->device_name) - 1);
-+	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,
-@@ -390,7 +393,8 @@ struct port_attributes *get_port_attribs(const char *host)
- 	if (!pa)
- 		goto free_path;
- 
--	strncpy(pa->device_name, host, sizeof(pa->device_name));
-+	strncpy(pa->device_name, host, sizeof(pa->device_name) - 1);
-+	pa->device_name[sizeof(pa->device_name) - 1] = '\0';
- 
- 	sa_sys_read_line(path, "symbolic_name", pa->symbolic_name,
- 			 sizeof(pa->symbolic_name));
-@@ -443,7 +447,7 @@ char *get_pci_dev_from_netdev(const char *netdev)
- 			return NULL;
- 
- 		len = strlen(netdev) - strlen(subif);
--		strncpy(realdev, netdev, len);
-+		strncpy(realdev, netdev, sizeof(realdev) - 1);
- 		if (realdev[len] != '\0')
- 			realdev[len] = '\0';
- 
--- 
-1.8.3.1
-
diff --git a/fcoe-utils-gcc7-fmt-truc-err.patch b/fcoe-utils-gcc7-fmt-truc-err.patch
deleted file mode 100644
index 3de42b442510c08781b4f047d61e351cff0a9175..0000000000000000000000000000000000000000
--- 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 d7602b0b3900b2a200470d16f5ba616456a5a0dc..0000000000000000000000000000000000000000
--- a/fcoe-utils-gcc8-fmt-truc-err.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Chris Leech <cleech@redhat.com>
-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 15a034987821e7fddff663aa3f964aa6c0a73132..d90e7b85fae8faf617cbe1e01c54976770147e60 100644
--- a/fcoe-utils.spec
+++ b/fcoe-utils.spec
@@ -1,6 +1,6 @@
 Name:               fcoe-utils
-Version:            1.0.32
-Release:            9
+Version:            1.0.33
+Release:            1
 Summary:            Fibre Channel over Ethernet utilities
 License:            GPLv2
 URL:                https://github.com/morbidrsa/fcoe-utils
@@ -8,10 +8,12 @@ Source0:            https://github.com/morbidrsa/fcoe-utils/archive/v%{version}.
 Source1:            quickstart.txt
 Source2:            fcoe.service
 Source3:            fcoe.config
-Patch0:             fcoe-utils-gcc7-fmt-truc-err.patch
-Patch1:             fcoe-utils-gcc8-fmt-truc-err.patch
+Patch0:             backport-00-Revert_Make_gcc_compiler_happy_about_ifname_string.patch 
+Patch1:             backport-01-fix_VLAN_device_name_overflow_check.patch 
+Patch2:             backport-02-string_op_truncation_format_trauncation.patch     
+Patch3:             backport-03-use-of-uninitialized-values-detected-during-LTO.patch
 #This patch refer to ubuntu's version
-Patch2:             fcoe-utils-fix-gcc9-build-error.patch
+
 
 BuildRequires:      autoconf automake libpciaccess-devel libtool lldpad-devel systemd
 Requires:           lldpad iproute device-mapper-multipath
@@ -62,7 +64,7 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config
 %config(noreplace) %{_sysconfdir}/sysconfig/fcoe
 %{_unitdir}/fcoe.service
 %{_sbindir}/*
-%{_sysconfdir}/bash_completion.d/*
+%{_datadir}/bash-completion/completions/*
 %{_libexecdir}/fcoe/
 
 %files help
@@ -71,6 +73,12 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config
 %{_mandir}/man8/*
 
 %changelog
+* Tue Mar 30 2021 lijingyuan <lijingyuan@huawei.com> - 1.0.33-1
+- Type:requirement
+- Id:NA
+- SUG:NA
+- DESC:update fcoe-utils-1.0.32 to fcoe-utils-1.0.33
+
 * Tue Dec 15 2020 xihaochen <xihaochen@huawei.com> - 1.0.32-9
 - Type:requirement
 - Id:NA