From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751394AbeAPOcS (ORCPT + 1 other); Tue, 16 Jan 2018 09:32:18 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:62879 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750905AbeAPOcR (ORCPT ); Tue, 16 Jan 2018 09:32:17 -0500 From: Arnd Bergmann To: Philipp Zabel Cc: Arnd Bergmann , Lucas Stach , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] [RESEND] gpu: ipu-v3: prg: avoid possible array underflow Date: Tue, 16 Jan 2018 15:31:55 +0100 Message-Id: <20180116143212.1411334-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:AJXVsjfJ4tzH74zQGfovJvjghKhzETwIlc3cC1VfSneaWcaJHQF 4q2HUjt1JEH0FVe0RDmWEFalS4m8sx9OTpBBkgCOxthgQ5haWWqbrnf3V0a7lBl97RWe+wU LaEHDnwtQmrGkmKmD+6MrfDR+JAH90Of8FiQnQJr5pDqpiB9UUZBObe4/qJvJf9Y0P2G5LJ T5KJCCB0FMh8RsutpUsjw== X-UI-Out-Filterresults: notjunk:1;V01:K0:f+bx5sdt0r0=:C+uCMMv69e2sy6c7FX++sp /twZe6W4nccJOj6nN8PkTTaPPeIrzNRR7tDlzuBYV1LmcptasRZq5rV55T54kdOBZ57C9EM7i fjRl9LN4DelO2NrlGY5hh7tag94mYfwGXdzL2h5FvQ0WiV/5+Tbv0UZhmXHmZ8QBVkuBhFSk2 w55qFLVTc4lUiB6QRbebRrbLGOMMtuceyBvT9ZSpz8y+n1PG/V+vrek/MI6TuEDl5ov8U2+kI BAfKf0q1FvsRHNhoi/QpXppxDU9bOs9bZnwbPFokdUXVMWYEcrx7AWXa692AnfhlWaXR40u1G nZuCTYwlAjBQUV/hFkwnH4o1hRPjTf2QBn0Ehm3R4P3I2jZ3HpiM4wiRgC+rN2CDgPNcd0cnb yOv5Unzqjp6EvzabAkrz/qJuDKo9jEjTrn2vWbUtUwpJO3u2Xg34qHFGaZQNBLqwJDF17CvZq fm5tuLRqloWZjqdFjcdnyBcYCE0TwcEms2SazUXKwUyRiMoPrw9Yk2XVkdVOkIZfgxqFV/+fY L73RpKR4qz7Mycmmfs8ncXHj8GZQ5d3q9qzCWdkV634V+AvUiqCxrbeBQdsbozXMRJju4Qubp RIawLILptrllF86mJkTFkioQFyZ7TV7W8+UWOzKQ/qyE92ASSZpobDZqJvfWCjyHzeIKpb0EL bV6rAHffSFmkFf2fxHSeuJEXHtMMRSxlPNO6P1aiwaZStgGX9RAB+3Z6AsNj/5CUtqQcx6VXS lv/e3IKS3FSmvoZUcv+pL2WxV9ocbkL1GHoqaw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: gcc-8 reports that we access an array with a negative index in an error case: drivers/gpu/ipu-v3/ipu-prg.c: In function 'ipu_prg_channel_disable': drivers/gpu/ipu-v3/ipu-prg.c:252:43: error: array subscript -22 is below array bounds of 'struct ipu_prg_channel[3]' [-Werror=array-bounds] This moves the range check in front of the dereference. Signed-off-by: Arnd Bergmann ---- Originally sent on Dec 4, 2017. No reply, so resending unchanged. --- drivers/gpu/ipu-v3/ipu-prg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/ipu-v3/ipu-prg.c b/drivers/gpu/ipu-v3/ipu-prg.c index 067365c733c6..0bcb935e525c 100644 --- a/drivers/gpu/ipu-v3/ipu-prg.c +++ b/drivers/gpu/ipu-v3/ipu-prg.c @@ -250,7 +250,7 @@ void ipu_prg_channel_disable(struct ipuv3_channel *ipu_chan) struct ipu_prg_channel *chan = &prg->chan[prg_chan]; u32 val; - if (!chan->enabled || prg_chan < 0) + if (prg_chan < 0 || !chan->enabled) return; pm_runtime_get_sync(prg->dev); -- 2.9.0