|
 |
0f2a69 |
From f8cff0808a24b1dd141e86cc8039108aa1763071 Mon Sep 17 00:00:00 2001
|
|
|
0f2a69 |
Message-Id: <f8cff0808a24b1dd141e86cc8039108aa1763071.1561628315.git.dcaratti@redhat.com>
|
|
|
0f2a69 |
From: Julian Anastasov <ja@ssi.bg>
|
|
|
0f2a69 |
Date: Sat, 5 Aug 2017 14:38:28 +0300
|
|
|
0f2a69 |
Subject: [PATCH] ipvsadm: catch the original errno from netlink answer
|
|
|
0f2a69 |
|
|
|
0f2a69 |
nl_recvmsgs_default() returns NLE_* error codes and not
|
|
|
0f2a69 |
errno values. As result, attempt to delete virtual service
|
|
|
0f2a69 |
returns NLE_OBJ_NOTFOUND (12) which matches the ENOMEM value.
|
|
|
0f2a69 |
|
|
|
0f2a69 |
Problem as reported by Emanuele Rocca:
|
|
|
0f2a69 |
|
|
|
0f2a69 |
ipvsadm -D -t example.org:80
|
|
|
0f2a69 |
Memory allocation problem
|
|
|
0f2a69 |
|
|
|
0f2a69 |
Fix it by providing generic error handler to catch the errno
|
|
|
0f2a69 |
value as returned in netlink answer. By this way all netlink
|
|
|
0f2a69 |
commands will get proper error string. The problem is present
|
|
|
0f2a69 |
only when ipvsadm is compiled with libnl.
|
|
|
0f2a69 |
|
|
|
0f2a69 |
ipvsadm -D -t example.org:80
|
|
|
0f2a69 |
No such service
|
|
|
0f2a69 |
|
|
|
0f2a69 |
Reported-by: Emanuele Rocca <ema@wikimedia.org>
|
|
|
0f2a69 |
Signed-off-by: Julian Anastasov <ja@ssi.bg>
|
|
|
0f2a69 |
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
|
|
|
0f2a69 |
---
|
|
|
0f2a69 |
libipvs/libipvs.c | 22 +++++++++++++++++++++-
|
|
|
0f2a69 |
1 file changed, 21 insertions(+), 1 deletion(-)
|
|
|
0f2a69 |
|
|
|
0f2a69 |
diff --git a/libipvs/libipvs.c b/libipvs/libipvs.c
|
|
|
0f2a69 |
index 180ea42..d271c48 100644
|
|
|
0f2a69 |
--- a/libipvs/libipvs.c
|
|
|
0f2a69 |
+++ b/libipvs/libipvs.c
|
|
|
0f2a69 |
@@ -74,9 +74,23 @@ static int ipvs_nl_noop_cb(struct nl_msg *msg, void *arg)
|
|
|
0f2a69 |
return NL_OK;
|
|
|
0f2a69 |
}
|
|
|
0f2a69 |
|
|
|
0f2a69 |
+struct cb_err_data {
|
|
|
0f2a69 |
+ int err;
|
|
|
0f2a69 |
+};
|
|
|
0f2a69 |
+
|
|
|
0f2a69 |
+static int ipvs_nl_err_cb(struct sockaddr_nl *nla, struct nlmsgerr *nlerr,
|
|
|
0f2a69 |
+ void *arg)
|
|
|
0f2a69 |
+{
|
|
|
0f2a69 |
+ struct cb_err_data *data = arg;
|
|
|
0f2a69 |
+
|
|
|
0f2a69 |
+ data->err = nlerr->error;
|
|
|
0f2a69 |
+ return -nl_syserr2nlerr(nlerr->error);
|
|
|
0f2a69 |
+}
|
|
|
0f2a69 |
+
|
|
|
0f2a69 |
int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg)
|
|
|
0f2a69 |
{
|
|
|
0f2a69 |
int err = EINVAL;
|
|
|
0f2a69 |
+ struct cb_err_data err_data = { .err = 0 };
|
|
|
0f2a69 |
|
|
|
0f2a69 |
sock = nl_socket_alloc();
|
|
|
0f2a69 |
if (!sock) {
|
|
|
0f2a69 |
@@ -100,12 +114,18 @@ int ipvs_nl_send_message(struct nl_msg *msg, nl_recvmsg_msg_cb_t func, void *arg
|
|
|
0f2a69 |
|
|
|
0f2a69 |
if (nl_socket_modify_cb(sock, NL_CB_VALID, NL_CB_CUSTOM, func, arg) != 0)
|
|
|
0f2a69 |
goto fail_genl;
|
|
|
0f2a69 |
+ if (nl_socket_modify_err_cb(sock, NL_CB_CUSTOM, ipvs_nl_err_cb,
|
|
|
0f2a69 |
+ &err_data) != 0)
|
|
|
0f2a69 |
+ goto fail_genl;
|
|
|
0f2a69 |
|
|
|
0f2a69 |
if (nl_send_auto_complete(sock, msg) < 0)
|
|
|
0f2a69 |
goto fail_genl;
|
|
|
0f2a69 |
|
|
|
0f2a69 |
- if ((err = -nl_recvmsgs_default(sock)) > 0)
|
|
|
0f2a69 |
+ if (nl_recvmsgs_default(sock) < 0) {
|
|
|
0f2a69 |
+ if (err_data.err)
|
|
|
0f2a69 |
+ err = -err_data.err;
|
|
|
0f2a69 |
goto fail_genl;
|
|
|
0f2a69 |
+ }
|
|
|
0f2a69 |
|
|
|
0f2a69 |
nlmsg_free(msg);
|
|
|
0f2a69 |
|
|
|
0f2a69 |
--
|
|
|
0f2a69 |
2.20.1
|
|
|
0f2a69 |
|