51 lines
1.3 KiB
Diff
51 lines
1.3 KiB
Diff
|
From d0362097e60d227bac4f66a06891ee1d807d2c48 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ivan Vecera <cera@cera.cz>
|
||
|
|
Date: Thu, 24 Sep 2020 19:51:47 +0200
|
||
|
|
Subject: [PATCH 16/17] netlink: return -ENOMEM when calloc fails
|
||
|
|
|
||
|
|
Fixes: f2c17e107900 ("netlink: add netlink handler for gfeatures (-k)")
|
||
|
|
|
||
|
|
Cc: Michal Kubecek <mkubecek@suse.cz>
|
||
|
|
Signed-off-by: Ivan Vecera <cera@cera.cz>
|
||
|
|
---
|
||
|
|
netlink/features.c | 9 +++++----
|
||
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/netlink/features.c b/netlink/features.c
|
||
|
|
index 3f1240437350..b2cf57eea660 100644
|
||
|
|
--- a/netlink/features.c
|
||
|
|
+++ b/netlink/features.c
|
||
|
|
@@ -112,16 +112,17 @@ int dump_features(const struct nlattr *const *tb,
|
||
|
|
unsigned int *feature_flags = NULL;
|
||
|
|
struct feature_results results;
|
||
|
|
unsigned int i, j;
|
||
|
|
- int ret;
|
||
|
|
+ int ret = 0;
|
||
|
|
|
||
|
|
ret = prepare_feature_results(tb, &results);
|
||
|
|
if (ret < 0)
|
||
|
|
return -EFAULT;
|
||
|
|
|
||
|
|
- ret = -ENOMEM;
|
||
|
|
feature_flags = calloc(results.count, sizeof(feature_flags[0]));
|
||
|
|
- if (!feature_flags)
|
||
|
|
+ if (!feature_flags) {
|
||
|
|
+ ret = -ENOMEM;
|
||
|
|
goto out_free;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
/* map netdev features to legacy flags */
|
||
|
|
for (i = 0; i < results.count; i++) {
|
||
|
|
@@ -184,7 +185,7 @@ int dump_features(const struct nlattr *const *tb,
|
||
|
|
|
||
|
|
out_free:
|
||
|
|
free(feature_flags);
|
||
|
|
- return 0;
|
||
|
|
+ return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
int features_reply_cb(const struct nlmsghdr *nlhdr, void *data)
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|