summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2015-03-17 18:48:24 (GMT)
committerMaciej Wereski <m.wereski@partner.samsung.com>2015-04-02 15:24:20 (GMT)
commitf824bbddbe27ca4ca642281e9132c76ed9d34bee (patch)
tree24c65c257edcc4fbdbba8063e2407b2d9cde8821
parentd51ac4b4b33af928a50722cae52f5af533bbc121 (diff)
downloadlinux-3.10-f824bbddbe27ca4ca642281e9132c76ed9d34bee.zip
linux-3.10-f824bbddbe27ca4ca642281e9132c76ed9d34bee.tar.gz
linux-3.10-f824bbddbe27ca4ca642281e9132c76ed9d34bee.tar.bz2
kdbus: connection: fix handling of failed fget()
The patch 5fc8dd5c84fc: "kdbus: add connection, queue handling and message validation code" from Sep 11, 2014, leads to the following static checker warning: ipc/kdbus/connection.c:2000 kdbus_cmd_send() warn: 'cancel_fd' isn't an ERR_PTR Fix this by checking for NULL pointers returned from fget(). Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--ipc/kdbus/connection.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ipc/kdbus/connection.c b/ipc/kdbus/connection.c
index e554f1a..ab476fa 100644
--- a/ipc/kdbus/connection.c
+++ b/ipc/kdbus/connection.c
@@ -1997,9 +1997,8 @@ int kdbus_cmd_send(struct kdbus_conn *conn, struct file *f, void __user *argp)
if (argv[1].item) {
cancel_fd = fget(argv[1].item->fds[0]);
- if (IS_ERR(cancel_fd)) {
- ret = PTR_ERR(cancel_fd);
- cancel_fd = NULL;
+ if (!cancel_fd) {
+ ret = -EBADF;
goto exit;
}