40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
From 2dcfe9ba33d65aa08373f84a31065597413fc762 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jakub Hrozek <jhrozek@redhat.com>
|
||
|
|
Date: Tue, 10 May 2016 12:24:44 +0200
|
||
|
|
Subject: [PATCH 3/3] IFP: Do not crash on invalid arguments to GetUserAttr
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
||
|
|
(cherry picked from commit 7ff6858b18fb463bc446797aa860960d5165fe9e)
|
||
|
|
---
|
||
|
|
src/responder/ifp/ifpsrv_cmd.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/responder/ifp/ifpsrv_cmd.c b/src/responder/ifp/ifpsrv_cmd.c
|
||
|
|
index ab6156fd6c92e8fd8176da6664cd6b79eb3f5a97..624db5f9f16b7f864dc2df67f7a62983686d8e29 100644
|
||
|
|
--- a/src/responder/ifp/ifpsrv_cmd.c
|
||
|
|
+++ b/src/responder/ifp/ifpsrv_cmd.c
|
||
|
|
@@ -83,7 +83,7 @@ int ifp_user_get_attr(struct sbus_request *dbus_req, void *data)
|
||
|
|
|
||
|
|
ret = ifp_user_get_attr_unpack_msg(attr_req);
|
||
|
|
if (ret != EOK) {
|
||
|
|
- return ret; /* handled internally */
|
||
|
|
+ return ret; /* internal error */
|
||
|
|
}
|
||
|
|
|
||
|
|
DEBUG(SSSDBG_FUNC_DATA,
|
||
|
|
@@ -117,7 +117,7 @@ ifp_user_get_attr_unpack_msg(struct ifp_attr_req *attr_req)
|
||
|
|
DBUS_TYPE_INVALID);
|
||
|
|
if (parsed == false) {
|
||
|
|
DEBUG(SSSDBG_OP_FAILURE, "Could not parse arguments\n");
|
||
|
|
- return EOK; /* handled */
|
||
|
|
+ return ERR_SBUS_REQUEST_HANDLED;
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Copy the attributes to maintain memory hierarchy with talloc */
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|