Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753731AbdHOBqq (ORCPT ); Mon, 14 Aug 2017 21:46:46 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56718 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753375AbdHOBTP (ORCPT ); Mon, 14 Aug 2017 21:19:15 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Wladimir J. van der Laan" , Philipp Zabel , Christian Gmeiner , Lucas Stach Subject: [PATCH 4.9 15/41] drm/etnaviv: Fix off-by-one error in reloc checking Date: Mon, 14 Aug 2017 18:18:25 -0700 Message-Id: <20170815011809.556831403@linuxfoundation.org> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170815011808.667221255@linuxfoundation.org> References: <20170815011808.667221255@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1174 Lines: 35 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wladimir J. van der Laan commit d6f756e09f01ea7a0efbbcef269a1e384a35d824 upstream. A relocation pointing to the last four bytes of a buffer can legitimately happen in the case of small vertex buffers. Signed-off-by: Wladimir J. van der Laan Reviewed-by: Philipp Zabel Reviewed-by: Christian Gmeiner Signed-off-by: Lucas Stach Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -264,8 +264,8 @@ static int submit_reloc(struct etnaviv_g if (ret) return ret; - if (r->reloc_offset >= bo->obj->base.size - sizeof(*ptr)) { - DRM_ERROR("relocation %u outside object", i); + if (r->reloc_offset > bo->obj->base.size - sizeof(*ptr)) { + DRM_ERROR("relocation %u outside object\n", i); return -EINVAL; }