From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Fri, 07 Jun 2019 07:58:23 +0000 Subject: Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read Message-Id: <20190607075823.GO31203@kadam> List-Id: References: <20190607072704.GA25229@mwanda> <5CFA14CD.5010502@bfs.de> In-Reply-To: <5CFA14CD.5010502@bfs.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: walter harms Cc: David Airlie , kernel-janitors@vger.kernel.org, Jyri Sarha , dri-devel@lists.freedesktop.org, Laurent Pinchart On Fri, Jun 07, 2019 at 09:39:57AM +0200, walter harms wrote: > > > Am 07.06.2019 09:27, schrieb Dan Carpenter: > > 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]); > > > mmmh, i am a big fan of KISS and in this case i would check sii902x->audio.i2s_fifo_sequence[i] > outside for(). like: > > for (i = 0; i < ARRAY_SIZE(sii902x->audio.i2s_fifo_sequence); i++) { > if (!sii902x->audio.i2s_fifo_sequence[i]) > break; That's probably a better way, but either way is acceptable and I left it how the author wrote it. regards, dan carpenter From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: Re: [PATCH 1/2] drm/bridge: sii902x: re-order conditions to prevent out of bounds read Date: Fri, 7 Jun 2019 10:58:23 +0300 Message-ID: <20190607075823.GO31203@kadam> References: <20190607072704.GA25229@mwanda> <5CFA14CD.5010502@bfs.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B9C889C94 for ; Fri, 7 Jun 2019 07:58:48 +0000 (UTC) Content-Disposition: inline In-Reply-To: <5CFA14CD.5010502@bfs.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: walter harms Cc: David Airlie , kernel-janitors@vger.kernel.org, Jyri Sarha , dri-devel@lists.freedesktop.org, Laurent Pinchart List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBKdW4gMDcsIDIwMTkgYXQgMDk6Mzk6NTdBTSArMDIwMCwgd2FsdGVyIGhhcm1zIHdy b3RlOgo+IAo+IAo+IEFtIDA3LjA2LjIwMTkgMDk6MjcsIHNjaHJpZWIgRGFuIENhcnBlbnRlcjoK PiA+IFRoaXMgc2hvdWxkIGNoZWNrIHRoYXQgImkiIGlzIHdpdGhpbiBib3VuZHMgYmVmb3JlIGNo ZWNraW5nIHJlYWRpbmcgZnJvbQo+ID4gdGhlIGFycmF5Lgo+ID4gCj4gPiBGaXhlczogZmY1Nzgx NjM0YzQxICgiZHJtL2JyaWRnZTogc2lpOTAyeDogSW1wbGVtZW50IEhETUkgYXVkaW8gc3VwcG9y dCIpCj4gPiBTaWduZWQtb2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNs ZS5jb20+Cj4gPiAtLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vYnJpZGdlL3NpaTkwMnguYyB8IDQg KystLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0p Cj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL3NpaTkwMnguYyBi L2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc2lpOTAyeC5jCj4gPiBpbmRleCBkNmY5OGQzODhhYzIu LjZiMDM2MTZkNmJjMyAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc2lp OTAyeC5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL3NpaTkwMnguYwo+ID4gQEAg LTU4OSw4ICs1ODksOCBAQCBzdGF0aWMgaW50IHNpaTkwMnhfYXVkaW9faHdfcGFyYW1zKHN0cnVj dCBkZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKPiA+ICAJaWYgKHJldCkKPiA+ICAJCWdvdG8gb3V0 Owo+ID4gIAo+ID4gLQlmb3IgKGkgPSAwOyBzaWk5MDJ4LT5hdWRpby5pMnNfZmlmb19zZXF1ZW5j ZVtpXSAmJgo+ID4gLQkJICAgICBpIDwgQVJSQVlfU0laRShzaWk5MDJ4LT5hdWRpby5pMnNfZmlm b19zZXF1ZW5jZSk7IGkrKykKPiA+ICsJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoc2lpOTAy eC0+YXVkaW8uaTJzX2ZpZm9fc2VxdWVuY2UpICYmCj4gPiArCQkgICAgc2lpOTAyeC0+YXVkaW8u aTJzX2ZpZm9fc2VxdWVuY2VbaV07IGkrKykKPiA+ICAJCXJlZ21hcF93cml0ZShzaWk5MDJ4LT5y ZWdtYXAsCj4gPiAgCQkJICAgICBTSUk5MDJYX1RQSV9JMlNfRU5BQkxFX01BUFBJTkdfUkVHLAo+ ID4gIAkJCSAgICAgc2lpOTAyeC0+YXVkaW8uaTJzX2ZpZm9fc2VxdWVuY2VbaV0pOwo+IAo+IAo+ IG1tbWgsIGkgYW0gYSBiaWcgZmFuIG9mIEtJU1MgYW5kIGluIHRoaXMgY2FzZSBpIHdvdWxkIGNo ZWNrIHNpaTkwMngtPmF1ZGlvLmkyc19maWZvX3NlcXVlbmNlW2ldCj4gb3V0c2lkZSBmb3IoKS4g bGlrZToKPiAKPiAJIGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHNpaTkwMngtPmF1ZGlvLmky c19maWZvX3NlcXVlbmNlKTsgaSsrKSB7Cj4gCSAgICAgICAgaWYgKCFzaWk5MDJ4LT5hdWRpby5p MnNfZmlmb19zZXF1ZW5jZVtpXSkKPiAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CgpU aGF0J3MgcHJvYmFibHkgYSBiZXR0ZXIgd2F5LCBidXQgZWl0aGVyIHdheSBpcyBhY2NlcHRhYmxl IGFuZCBJIGxlZnQgaXQKaG93IHRoZSBhdXRob3Igd3JvdGUgaXQuCgpyZWdhcmRzLApkYW4gY2Fy cGVudGVyCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=