From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Fri, 07 Jun 2019 07:27:04 +0000 Subject: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read Message-Id: <20190607072704.GA25229@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Andrzej Hajda , Jyri Sarha Cc: David Airlie , dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Laurent Pinchart This should check that "i" is within bounds before checking reading from the array. Fixes: ff5781634c41 ("drm/bridge: sii902x: Implement HDMI audio support") Signed-off-by: Dan Carpenter --- drivers/gpu/drm/bridge/sii902x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c index d6f98d388ac2..6b03616d6bc3 100644 --- a/drivers/gpu/drm/bridge/sii902x.c +++ b/drivers/gpu/drm/bridge/sii902x.c @@ -589,8 +589,8 @@ static int sii902x_audio_hw_params(struct device *dev, void *data, if (ret) goto out; - for (i = 0; sii902x->audio.i2s_fifo_sequence[i] && - i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++) + for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence) && + sii902x->audio.i2s_fifo_sequence[i]; i++) regmap_write(sii902x->regmap, SII902X_TPI_I2S_ENABLE_MAPPING_REG, sii902x->audio.i2s_fifo_sequence[i]); -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read Date: Fri, 7 Jun 2019 10:27:04 +0300 Message-ID: <20190607072704.GA25229@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8EE68899DC for ; Fri, 7 Jun 2019 07:27:29 +0000 (UTC) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Andrzej Hajda , Jyri Sarha Cc: David Airlie , dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Laurent Pinchart List-Id: dri-devel@lists.freedesktop.org VGhpcyBzaG91bGQgY2hlY2sgdGhhdCAiaSIgaXMgd2l0aGluIGJvdW5kcyBiZWZvcmUgY2hlY2tp bmcgcmVhZGluZyBmcm9tCnRoZSBhcnJheS4KCkZpeGVzOiBmZjU3ODE2MzRjNDEgKCJkcm0vYnJp ZGdlOiBzaWk5MDJ4OiBJbXBsZW1lbnQgSERNSSBhdWRpbyBzdXBwb3J0IikKU2lnbmVkLW9mZi1i eTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9icmlkZ2Uvc2lpOTAyeC5jIHwgNCArKy0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNl cnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9i cmlkZ2Uvc2lpOTAyeC5jIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zaWk5MDJ4LmMKaW5kZXgg ZDZmOThkMzg4YWMyLi42YjAzNjE2ZDZiYzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9i cmlkZ2Uvc2lpOTAyeC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc2lpOTAyeC5jCkBA IC01ODksOCArNTg5LDggQEAgc3RhdGljIGludCBzaWk5MDJ4X2F1ZGlvX2h3X3BhcmFtcyhzdHJ1 Y3QgZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJaWYgKHJldCkKIAkJZ290byBvdXQ7CiAKLQlm b3IgKGkgPSAwOyBzaWk5MDJ4LT5hdWRpby5pMnNfZmlmb19zZXF1ZW5jZVtpXSAmJgotCQkgICAg IGkgPCBBUlJBWV9TSVpFKHNpaTkwMngtPmF1ZGlvLmkyc19maWZvX3NlcXVlbmNlKTsgaSsrKQor CWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHNpaTkwMngtPmF1ZGlvLmkyc19maWZvX3NlcXVl bmNlKSAmJgorCQkgICAgc2lpOTAyeC0+YXVkaW8uaTJzX2ZpZm9fc2VxdWVuY2VbaV07IGkrKykK IAkJcmVnbWFwX3dyaXRlKHNpaTkwMngtPnJlZ21hcCwKIAkJCSAgICAgU0lJOTAyWF9UUElfSTJT X0VOQUJMRV9NQVBQSU5HX1JFRywKIAkJCSAgICAgc2lpOTAyeC0+YXVkaW8uaTJzX2ZpZm9fc2Vx dWVuY2VbaV0pOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWw=