IronPort-SDR: Wf0Rg9IJBo32/OnWY7S3QskN7UsoixtfI0Ag4RJ5sDq/ej3Y2iClB3tnytkyDRiQ020OlgGXEl
 yeVUz+AVYEvkJyHMGngmOw8rCJl/T1w8MSgUzfRDP42FC45u6rcAfDknKerCGaSUXg1RI24FUe
 usMOFoxw61zOuvPFcqEfAgDr9ivcdeG7HnMin78ish9g6sggSmhg2E4T+MGmy/e/BvGXxl3Gd6
 D0eJRLRpg3tiDA8kUjpmlTvye7RCy94gG4gqmqrurgnAaPjEbeLaQRt7hSgIHJOijdi37TKzL6
 XDlh9Yw1ngiHRlZGjy/qn6Z8
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:05 -0800
Message-Id: <20211116070708.429432-2-yzhai003@ucr.edu>
In-Reply-To: <20211116070708.429432-1-yzhai003@ucr.edu>
References: <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