From 547129b6adfbdd0ac85bb71e6b341b5546d51990 Mon Sep 17 00:00:00 2001 From: Kamal Agrawal Date: Thu, 29 Apr 2021 00:57:58 +0530 Subject: [PATCH] msm: kgsl: Avoid flooding kernel log with invalid ioctl errors For invalid ioctl inputs from user, kgsl already returns -ENOIOCTLCMD error code. Avoid flooding kernel log with such errors. Change-Id: Iaf9c8eb0c51b221738482e2b4b02289913a2878e Signed-off-by: Kamal Agrawal --- drivers/gpu/msm/adreno_ioctl.c | 7 ++----- drivers/gpu/msm/kgsl_compat.c | 4 +--- drivers/gpu/msm/kgsl_ioctl.c | 4 +--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/msm/adreno_ioctl.c b/drivers/gpu/msm/adreno_ioctl.c index 4894d4ede4dc..2b69d7934d78 100644 --- a/drivers/gpu/msm/adreno_ioctl.c +++ b/drivers/gpu/msm/adreno_ioctl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2002,2007-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2002,2007-2021, The Linux Foundation. All rights reserved. */ #include @@ -183,11 +183,8 @@ long adreno_ioctl_helper(struct kgsl_device_private *dev_priv, break; } - if (i == len) { - dev_err(dev_priv->device->dev, - "invalid ioctl code 0x%08X\n", cmd); + if (i == len) return -ENOIOCTLCMD; - } if (_IOC_SIZE(cmds[i].cmd > sizeof(data))) { dev_err_ratelimited(dev_priv->device->dev, diff --git a/drivers/gpu/msm/kgsl_compat.c b/drivers/gpu/msm/kgsl_compat.c index b69e921833dd..084fef20daca 100644 --- a/drivers/gpu/msm/kgsl_compat.c +++ b/drivers/gpu/msm/kgsl_compat.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved. */ #include "kgsl_device.h" @@ -384,8 +384,6 @@ long kgsl_compat_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) if (ret == -ENOIOCTLCMD) { if (device->ftbl->compat_ioctl != NULL) return device->ftbl->compat_ioctl(dev_priv, cmd, arg); - - dev_err(device->dev, "invalid ioctl code 0x%08X\n", cmd); } return ret; diff --git a/drivers/gpu/msm/kgsl_ioctl.c b/drivers/gpu/msm/kgsl_ioctl.c index 746acb4a8161..af39c2d8ae13 100644 --- a/drivers/gpu/msm/kgsl_ioctl.c +++ b/drivers/gpu/msm/kgsl_ioctl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2008-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2008-2021, The Linux Foundation. All rights reserved. */ #include "kgsl_device.h" @@ -181,8 +181,6 @@ long kgsl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) return device->ftbl->compat_ioctl(dev_priv, cmd, arg); else if (device->ftbl->ioctl != NULL) return device->ftbl->ioctl(dev_priv, cmd, arg); - - dev_err(device->dev, "invalid ioctl code 0x%08X\n", cmd); } return ret;