git: 0fed2239730f - stable/13 - libifconfig: Set error in ifconfig_get_groups

[Ryan Moeller]

The branch stable/13 has been updated by freqlabs:

URL: https://cgit.FreeBSD.org/src/commit/?id=0fed2239730f3bfa7ea71b6468565b8266019526

commit 0fed2239730f3bfa7ea71b6468565b8266019526
Author:     Ryan Moeller <freqlabs at FreeBSD.org>
AuthorDate: 2021-02-27 08:07:21 +0000
Commit:     Ryan Moeller <freqlabs at FreeBSD.org>
CommitDate: 2021-03-14 08:05:01 +0000

    libifconfig: Set error in ifconfig_get_groups
    
    This should return -1 with OTHER/ENOMEM set in the handle when malloc
    fails, like everywhere else in libifconfig.
    
    Reviewed by:    kp
    Differential Revision:  https://reviews.freebsd.org/D28964
    
    (cherry picked from commit 1d9ba697f99a88b321a7d8b96fa142ea774cd3be)
---
 lib/libifconfig/libifconfig.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/libifconfig/libifconfig.c b/lib/libifconfig/libifconfig.c
index e67c4e4de04e..1733239132a0 100644
--- a/lib/libifconfig/libifconfig.c
+++ b/lib/libifconfig/libifconfig.c
@@ -511,7 +511,9 @@ ifconfig_get_groups(ifconfig_handle_t *h, const char *name,
 	len = ifgr->ifgr_len;
 	ifgr->ifgr_groups = (struct ifg_req *)malloc(len);
 	if (ifgr->ifgr_groups == NULL) {
-		return (1);
+		h->error.errtype = OTHER;
+		h->error.errcode = ENOMEM;
+		return (-1);
 	}
 	bzero(ifgr->ifgr_groups, len);
 	if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCGIFGROUP, ifgr) == -1) {