From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932318AbbCQSsg (ORCPT ); Tue, 17 Mar 2015 14:48:36 -0400 Received: from svenfoo.org ([82.94.215.22]:54748 "EHLO mail.zonque.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932220AbbCQSsf (ORCPT ); Tue, 17 Mar 2015 14:48:35 -0400 From: Daniel Mack To: gregkh@linuxfoundation.org Cc: dh.herrmann@googlemail.com, tixxdz@opendz.org, dan.carpenter@oracle.com, linux-kernel@vger.kernel.org, Daniel Mack Subject: [PATCH] kdbus: connection: fix handling of failed fget() Date: Tue, 17 Mar 2015 19:48:24 +0100 Message-Id: <1426618104-32401-1-git-send-email-daniel@zonque.org> X-Mailer: git-send-email 2.3.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Daniel Mack --- ipc/kdbus/connection.c | 5 ++--- 1 file 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; } -- 2.3.2