gpu: nvgpu: Remove BUG_ON from _IOC_SIZE checks

When the user-supplied ioctl argument size is too large, just return
-EINVAL from the ioctl instead of crashing on a BUG_ON (for as, ctrl,
ctxsw, dbg and tsg nodes - channel and sched nodes are already okay).

Bug 1849661

Change-Id: I5b0d1d0c4ee47ce0136c424dda5975353f110c7e
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1266606
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

5 files changed, 12 insertions, 16 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/as_gk20a.c b/drivers/gpu/nvgpu/gk20a/as_gk20a.c
index 6cdbe3e1..0b90090a 100644
--- a/drivers/gpu/nvgpu/gk20a/as_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/as_gk20a.c
@@ -368,11 +368,10 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
         if ((_IOC_TYPE(cmd) != NVGPU_AS_IOCTL_MAGIC) ||
                 (_IOC_NR(cmd) == 0) ||
-                (_IOC_NR(cmd) > NVGPU_AS_IOCTL_LAST))
+                (_IOC_NR(cmd) > NVGPU_AS_IOCTL_LAST) ||
+                (_IOC_SIZE(cmd) > NVGPU_AS_IOCTL_MAX_ARG_SIZE))
                 return -EINVAL;
 
-        BUG_ON(_IOC_SIZE(cmd) > NVGPU_AS_IOCTL_MAX_ARG_SIZE);
-
         memset(buf, 0, sizeof(buf));
         if (_IOC_DIR(cmd) & _IOC_WRITE) {
                 if (copy_from_user(buf, (void __user *)arg, _IOC_SIZE(cmd)))
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
index defa4fdd..77479d99 100644
--- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
@@ -1316,11 +1316,10 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg
 
         if ((_IOC_TYPE(cmd) != NVGPU_GPU_IOCTL_MAGIC) ||
                 (_IOC_NR(cmd) == 0) ||
-                (_IOC_NR(cmd) > NVGPU_GPU_IOCTL_LAST))
+                (_IOC_NR(cmd) > NVGPU_GPU_IOCTL_LAST) ||
+                (_IOC_SIZE(cmd) > NVGPU_GPU_IOCTL_MAX_ARG_SIZE))
                 return -EINVAL;
 
-        BUG_ON(_IOC_SIZE(cmd) > NVGPU_GPU_IOCTL_MAX_ARG_SIZE);
-
         memset(buf, 0, sizeof(buf));
         if (_IOC_DIR(cmd) & _IOC_WRITE) {
                 if (copy_from_user(buf, (void __user *)arg, _IOC_SIZE(cmd)))
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
index 1f18d9cf..a443512c 100644
--- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
@@ -360,12 +360,12 @@ long gk20a_ctxsw_dev_ioctl(struct file *filp, unsigned int cmd,
 
         gk20a_dbg(gpu_dbg_fn|gpu_dbg_ctxsw, "nr=%d", _IOC_NR(cmd));
 
-        if ((_IOC_TYPE(cmd) != NVGPU_CTXSW_IOCTL_MAGIC) || (_IOC_NR(cmd) == 0)
-                || (_IOC_NR(cmd) > NVGPU_CTXSW_IOCTL_LAST))
+        if ((_IOC_TYPE(cmd) != NVGPU_CTXSW_IOCTL_MAGIC) ||
+                (_IOC_NR(cmd) == 0) ||
+                (_IOC_NR(cmd) > NVGPU_CTXSW_IOCTL_LAST) ||
+                (_IOC_SIZE(cmd) > NVGPU_CTXSW_IOCTL_MAX_ARG_SIZE))
                 return -EINVAL;
 
-        BUG_ON(_IOC_SIZE(cmd) > NVGPU_CTXSW_IOCTL_MAX_ARG_SIZE);
-
         memset(buf, 0, sizeof(buf));
         if (_IOC_DIR(cmd) & _IOC_WRITE) {
                 if (copy_from_user(buf, (void __user *) arg, _IOC_SIZE(cmd)))
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index 1a219d2e..cd3ab0c2 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -880,11 +880,10 @@ long gk20a_dbg_gpu_dev_ioctl(struct file *filp, unsigned int cmd,
 
         if ((_IOC_TYPE(cmd) != NVGPU_DBG_GPU_IOCTL_MAGIC) ||
             (_IOC_NR(cmd) == 0) ||
-            (_IOC_NR(cmd) > NVGPU_DBG_GPU_IOCTL_LAST))
+            (_IOC_NR(cmd) > NVGPU_DBG_GPU_IOCTL_LAST) ||
+            (_IOC_SIZE(cmd) > NVGPU_DBG_GPU_IOCTL_MAX_ARG_SIZE))
                 return -EINVAL;
 
-        BUG_ON(_IOC_SIZE(cmd) > NVGPU_DBG_GPU_IOCTL_MAX_ARG_SIZE);
-
         memset(buf, 0, sizeof(buf));
         if (_IOC_DIR(cmd) & _IOC_WRITE) {
                 if (copy_from_user(buf, (void __user *)arg, _IOC_SIZE(cmd)))
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
index d98b78ea..181140d2 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
@@ -608,11 +608,10 @@ long gk20a_tsg_dev_ioctl(struct file *filp, unsigned int cmd,
 
         if ((_IOC_TYPE(cmd) != NVGPU_TSG_IOCTL_MAGIC) ||
             (_IOC_NR(cmd) == 0) ||
-            (_IOC_NR(cmd) > NVGPU_TSG_IOCTL_LAST))
+            (_IOC_NR(cmd) > NVGPU_TSG_IOCTL_LAST) ||
+            (_IOC_SIZE(cmd) > NVGPU_TSG_IOCTL_MAX_ARG_SIZE))
                 return -EINVAL;
 
-        BUG_ON(_IOC_SIZE(cmd) > NVGPU_TSG_IOCTL_MAX_ARG_SIZE);
-
         memset(buf, 0, sizeof(buf));
         if (_IOC_DIR(cmd) & _IOC_WRITE) {
                 if (copy_from_user(buf, (void __user *)arg, _IOC_SIZE(cmd)))