From patchwork Thu Jan 19 20:41:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9526759 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CDB4560459 for ; Thu, 19 Jan 2017 20:45:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF91028639 for ; Thu, 19 Jan 2017 20:45:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B416C28651; Thu, 19 Jan 2017 20:45:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6872428639 for ; Thu, 19 Jan 2017 20:45:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754634AbdASUoP (ORCPT ); Thu, 19 Jan 2017 15:44:15 -0500 Received: from mailrelay118.isp.belgacom.be ([195.238.20.145]:53961 "EHLO mailrelay118.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751187AbdASUmY (ORCPT ); Thu, 19 Jan 2017 15:42:24 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DdAgA1JIFY/+M5QFdegxpVAQEBAQEfg?= =?us-ascii?q?WmOS5E5AUWSMIIPggyGIoICQBQBAgEBAQEBAQFjKIUXLyMpcSQTiHYRsXA6hBC?= =?us-ascii?q?GbIZLjxsFm0SRWA2QbpJwHziBKRoYhCYBgks9NYk0AQEB?= X-IPAS-Result: =?us-ascii?q?A2DdAgA1JIFY/+M5QFdegxpVAQEBAQEfgWmOS5E5AUWSMII?= =?us-ascii?q?PggyGIoICQBQBAgEBAQEBAQFjKIUXLyMpcSQTiHYRsXA6hBCGbIZLjxsFm0SRW?= =?us-ascii?q?A2QbpJwHziBKRoYhCYBgks9NYk0AQEB?= Received: from 227.57-64-87.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([87.64.57.227]) by relay.skynet.be with ESMTP; 19 Jan 2017 21:41:45 +0100 From: Fabian Frederick To: Jan Kara Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 1/1 linux-next] udf: return inappropriate ioctl instead of argument error Date: Thu, 19 Jan 2017 21:41:37 +0100 Message-Id: <20170119204137.31158-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, lsattr for instance in udf directory gives "udf: Invalid argument While reading flags on ..." This patch removes argument testing and returns -ENOIOCTLCMD when command is unknown to have more accurate message like this: "Inappropriate ioctl for device While reading flags on ..." If arg is NULL, we return specific operation error anyway. Signed-off-by: Fabian Frederick --- fs/udf/file.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/udf/file.c b/fs/udf/file.c index dbcb3a4a..964620b 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -184,12 +184,6 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) goto out; } - if (!arg) { - udf_debug("invalid argument to udf_ioctl\n"); - result = -EINVAL; - goto out; - } - switch (cmd) { case UDF_GETVOLIDENT: if (copy_to_user((char __user *)arg, @@ -220,6 +214,8 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) UDF_I(inode)->i_ext.i_data, UDF_I(inode)->i_lenEAttr) ? -EFAULT : 0; goto out; + default: + return -ENOIOCTLCMD; } out: