IronPort-SDR: y4fuE5wzEEuY9D62hsmlvbsi0bE5sfhRyzI2rBq1deGFJA74eZKNe1anvuf42D4uM7KC8TQVG5
 kQnkWDJHMLB0xSsE7KmX5wWHuhIazHaK1A4QX3IvptME8JZOjTwsH1HaiScFnf+uY24YNFp64g
 3Uwo2Dp57ZySlwusTfFtVMB50DxpC/ojLsv+uGSNHRX18xqqzDgDlJWdJGw96dbKx2HpyknD0w
 UXQYiCs8eHME4L7GOcU3ZOlYl+x0zmUCrot3bgg4PD1sBO40VMxTg+B9PmOahgCYGLtObAD/3X
 /HAawmW4K8lz7FXTMm7JrYL0
From:   Yizhuo Zhai <yzhai003@ucr.edu>
Cc:     Yizhuo Zhai <yzhai003@ucr.edu>, Ben Skeggs <bskeggs@redhat.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>, Lyude Paul <lyude@redhat.com>,
        dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] In function nvkm_ioctl_map(), the variable "type" could be uninitialized if "nvkm_object_map()" returns error code, however, it does not check the return value and directly use the "type" in the if statement, which is potentially unsafe.
Date:   Mon, 15 Nov 2021 23:07:04 -0800
Message-Id: <20211116070708.429432-1-yzhai003@ucr.edu>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk

Fixes:01326050391ce("drm/nouveau/core/object: allow arguments to
be passed to map function")
Signed-off-by: Yizhuo Zhai <yzhai003@ucr.edu>
---
 drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
index 735cb6816f10..4264d9d79783 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
@@ -266,6 +266,8 @@ nvkm_ioctl_map(struct nvkm_client *client,
 		ret = nvkm_object_map(object, data, size, &type,
 				      &args->v0.handle,
 				      &args->v0.length);
+		if (ret)
+			return ret;
 		if (type == NVKM_OBJECT_MAP_IO)
 			args->v0.type = NVIF_IOCTL_MAP_V0_IO;
 		else
-- 
2.25.1