packages/lldpad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!6 check return value of function ecp_create

Browse Source 
From: @zengwefeng
Reviewed-by: @seuzw
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2021-01-27 09:50:38 +08:00 committed by Gitee
commit 3db1c4d0cf
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lldpad.spec
View File

@ -4,7 +4,7 @@
Name: lldpad Name: lldpad
Version: 1.0.1 Version: 1.0.1
Release: 14 Release: 15
Summary: Intel LLDP Agent Summary: Intel LLDP Agent
License: GPLv2 License: GPLv2
URL: https://www.open-lldp.org URL: https://www.open-lldp.org
@ -36,6 +36,7 @@ Patch24: open-lldp-v1.0.1-24-switch-from-sysv-to-posix-shared-memory-apis.pa
Patch25: open-lldp-v1.0.1-25-l2_linux_packet-correctly-process-return-value-of-ge.patch Patch25: open-lldp-v1.0.1-25-l2_linux_packet-correctly-process-return-value-of-ge.patch
Patch26: open-lldp-v1.0.1-26-lldpad-system-capability-incorrect-advertised-as-sta.patch Patch26: open-lldp-v1.0.1-26-lldpad-system-capability-incorrect-advertised-as-sta.patch
Patch27: open-lldp-v1.0.1-27-fix-build-warnings.patch Patch27: open-lldp-v1.0.1-27-fix-build-warnings.patch
Patch28: open-lldp-ecp-allow-for-failure-to-create.patch
BuildRequires: automake autoconf libtool flex kernel-headers libconfig-devel BuildRequires: automake autoconf libtool flex kernel-headers libconfig-devel
BuildRequires: libnl3-devel readline-devel systemd git BuildRequires: libnl3-devel readline-devel systemd git
@ -110,6 +111,12 @@ make check
%{_mandir}/man*/* %{_mandir}/man*/*
%changelog %changelog
* Tue Jan 26 2021 zengwefeng<zwfeng@huawei.com> - 1.0.1-15
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:check the return value of ecp_create
* Thu Sep 10 2020 lunankun <lunankun@huawei.com> - 1.0.1-14 * Thu Sep 10 2020 lunankun <lunankun@huawei.com> - 1.0.1-14
- Type:bugfix - Type:bugfix
- Id:NA - Id:NA

29
open-lldp-ecp-allow-for-failure-to-create.patch Normal file
View File

@ -0,0 +1,29 @@
From 488051ae0b88b8b77081fadff8154dbd4ddfd54c Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 26 Jan 2021 16:16:17 +0800
Subject: [PATCH] ecp-allow-for-failure-to-create.patch
---
qbg/ecp22.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/qbg/ecp22.c b/qbg/ecp22.c
index 4640701..ba8f891 100644
--- a/qbg/ecp22.c
+++ b/qbg/ecp22.c
@@ -782,7 +782,11 @@ void ecp22_start(char *ifname)
ecp = find_ecpdata(ifname, eud);
if (!ecp)
ecp = ecp22_create(ifname, eud);
- ecp->max_retries = ECP22_MAX_RETRIES_DEFAULT;
+ if (!ecp) {
+ LLDPAD_DBG("%s:%s failed creating ECP22 instance\n", __func__, ifname);
+ return;
+ }
+ ecp->max_retries = ECP22_MAX_RETRIES_DEFAULT;
ecp->max_rte = ECP22_ACK_TIMER_DEFAULT;
LIST_INIT(&ecp->inuse.head);
ecp->inuse.last = 0;
--
2.23.0