加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
backport-macvtap-fix-error-condition.patch 966 Bytes
一键复制 编辑 原始数据 按行查看 历史
yangl777 提交于 2022-09-14 14:17 . backport upstream patches
From 56b21ceb743fabe290ef7a8be8bbeecc55888a9e Mon Sep 17 00:00:00 2001
From: Aaron Conole <aconole@redhat.com>
Date: Wed, 25 Aug 2021 10:22:20 -0400
Subject: [PATCH] macvtap: fix error condition
If the socket() call fails, we will jump to out and pass a
negative value to close() which is not allowed.
Conflict:NA
Reference:https://github.com/openSUSE/lldpad/commit/56b21ceb743fabe290ef7a8be8bbeecc55888a9e
Fixes: d43abb0267f3 ("lldpad: do not use macv[tap/lan] interfaces as ports")
closes https://github.com/intel/openlldp/issues/75
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
lldp_util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lldp_util.c b/lldp_util.c
index 1e58b1e..be1333e 100644
--- a/lldp_util.c
+++ b/lldp_util.c
@@ -681,7 +681,7 @@ int is_macvtap(const char *ifname)
s = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
if (s < 0) {
- goto out;
+ return false;
}
nlh = malloc(NLMSG_SIZE);
--
1.8.3.1
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化