From f0ec91055e6d841236679fd24136ad136482828b Mon Sep 17 00:00:00 2001 From: yinjiaming Date: Thu, 24 Aug 2023 15:02:19 +0800 Subject: [PATCH] =?UTF-8?q?fixed=2005ebb28=20from=20https://gitee.com/hgbv?= =?UTF-8?q?eiu743/third=5Fparty=5Fmusl/pulls/1044=20fix:=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?getifaddrs=E5=87=BD=E6=95=B0=E6=AD=A3=E5=B8=B8=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=9C=AA=E9=87=8A=E6=94=BEfd=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20getifaddrs=E5=87=BD=E6=95=B0=E5=9C=A8retur?= =?UTF-8?q?n=200=20=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E9=87=8A=E6=94=BE=E6=89=80=E5=8D=A0=E6=8D=AE=E7=9A=84=20fd?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E4=BA=88=E4=BB=A5=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yinjiaming Change-Id: I79f96880c6544d9548dcb1dd33b287981c18c0a9 --- porting/liteos_a/user/src/network/getifaddrs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/porting/liteos_a/user/src/network/getifaddrs.c b/porting/liteos_a/user/src/network/getifaddrs.c index 144bd1715..ed9ad0089 100644 --- a/porting/liteos_a/user/src/network/getifaddrs.c +++ b/porting/liteos_a/user/src/network/getifaddrs.c @@ -251,16 +251,16 @@ int getifaddrs(struct ifaddrs **ifap) if ((fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0)) < 0) return -1; if (ioctl(fd, SIOCGIFCONF, &ifconfig) < 0) - goto error; + goto exit; if (ifconfig.ifc_len % sizeof(struct ifreq)) { errno = EINVAL; - goto error; + goto exit; } ifno = ifconfig.ifc_len / sizeof(struct ifreq); if (!(ifstart = ifaddrs_init())) { errno = ENOMEM; - goto error; + goto exit; } struct ifaddrs *ifa = ifstart; @@ -287,10 +287,12 @@ int getifaddrs(struct ifaddrs **ifap) } *ifap = ifstart; + __syscall(SYS_close, fd); return 0; error: freeifaddrs(ifstart); +exit: __syscall(SYS_close, fd); return -1; } -- Gitee