From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752810AbdF2MEQ (ORCPT ); Thu, 29 Jun 2017 08:04:16 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:63410 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752785AbdF2MEJ (ORCPT ); Thu, 29 Jun 2017 08:04:09 -0400 X-AuditID: cbfec7f1-f796e6d00000116b-76-5954ecb6e0bd Subject: Re: [PATCH v3 3/8] [media] s5p-jpeg: Handle parsing error in s5p_jpeg_parse_hdr() To: Thierry Escande , Jacek Anaszewski , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org From: Andrzej Pietrasiewicz Message-id: Date: Thu, 29 Jun 2017 14:04:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-version: 1.0 In-reply-to: <1498579734-1594-4-git-send-email-thierry.escande@collabora.com> Content-type: text/plain; charset=utf-8; format=flowed Content-language: en-US Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLKsWRmVeSWpSXmKPExsWy7djP87rb3oREGty5IWtxe+sGFovLu+aw WfRs2MpqsWzTHyaL/quX2BxYPXbcXcLosXPWXXaPTas62Tw+b5ILYInisklJzcksSy3St0vg ymiY/4ulYKJgxZ+TG9gaGB/wdjFyckgImEis/POGCcIWk7hwbz1bFyMXh5DAUkaJLduusEA4 nxklNlxezgzT8bLpHCtEYhmjxPyta6CqXjBK/H77EWyWsECMxIKPnUwgCRGBCYwSB7btZAdJ MAvYSnQc6mQBsdkEjCX2HuxgBLF5BewkbndvAbNZBFQlep/dAKsXFYiQWDRpIjtEjaDEj8n3 wHo5BXwl1u5rZIOYaSXx7F8rK4QtLtHcepMFwpaX2LzmLTPIERIC89glFi3YBJTgAHJkJTYd gHrHReL5yvVsELawxKvjW9ghbBmJzo6DTBC9k4H+v/mBBcLZziix9tgJVogqa4nDxy9CbeaT mLRtOjPEAl6JjjYhiBIPieXndkEtcJRYfGg5NLgeM0q0dv9mmcCoMAvJc7OQPDQLyUOzkDy0 gJFlFaNIamlxbnpqsZFecWJucWleul5yfu4mRmCiOf3v+McdjO9PWB1iFOBgVOLhZVgbHCnE mlhWXJl7iFGCg1lJhJf5RUikEG9KYmVValF+fFFpTmrxIUZpDhYlcV6uU9cihATSE0tSs1NT C1KLYLJMHJxSDYyMvUzfRYo+3/5YuqFkcqHfLr4vgs+01zotKSuerfHceY+K5HWPeHNpb+vt Ohf0J904uuqE3kFWvkd71dtvTvu8sFGVW9GSX8py8u9AIal57cuCVDZVPZ+28de/4+JNmle6 6/4Yn8t6KzTRvVk2s994c8RWTpnpGW/V783aMye57hxzqVfD/b9KLMUZiYZazEXFiQBmc0nq MAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsVy+t/xa7pb34REGsw6YGFxe+sGFovLu+aw WfRs2MpqsWzTHyaL/quX2BxYPXbcXcLosXPWXXaPTas62Tw+b5ILYIlys8lITUxJLVJIzUvO T8nMS7dVCg1x07VQUshLzE21VYrQ9Q0JUlIoS8wpBfKMDNCAg3OAe7CSvl2CW0bD/F8sBRMF K/6c3MDWwPiAt4uRk0NCwETiZdM5VghbTOLCvfVsXYxcHEICSxglFl5cDeW8YJRoOf4ErEpY IEZiwcdOJpCEiMAkRomVW/8ygSSYBWwlOg51skB0PAbq+HuXGSTBJmAssfdgByOIzStgJ3G7 ewuYzSKgKtH77AY7iC0qECGx6/oBVogaQYkfk++xgNicAr4Sa/c1skEsMJP48vIwK4QtLtHc epMFwpaX2LzmLfMERsFZSNpnIWmZhaRlFpKWBYwsqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3 MQJjbtuxn5t3MF7aGHyIUYCDUYmHd8Wq4Egh1sSy4srcQ4wSHMxKIrzML0IihXhTEiurUovy 44tKc1KLDzGaAj03kVlKNDkfmA7ySuINTQzNLQ2NjC0szI2MlMR5Sz5cCRcSSE8sSc1OTS1I LYLpY+LglGpgnDHt5uZ1i1cGB1Xf6l5/5H2Yhdt2o4M+MwV+ZrqmxRv5Bi7R/q3Coi0t6Bv7 Qex0+/xu9T6ZMCZ145BDJnqKBxKmMh53DXCcM9nK+nkt09oQ1x1C3y4YtCnlHjl8mif+wfHA zXcVpsnsvv300D0574Jm7lU++4uqxNhN/yQ6bVW35mXY86BdiaU4I9FQi7moOBEA7eytJc8C AAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170629120405eucas1p19be01fa30794dbac68f08886ce48afd8 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBQaWV0cmFzaWV3aWN6G1NSUE9MLUtlcm5lbCAo?= =?UTF-8?B?VFApG+yCvOyEseyghOyekBtTZW5pb3IgU29mdHdhcmUgRW5naW5lZXI=?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBUb21hc3ogUGlldHJhc2lld2ljehtTUlBPTC1L?= =?UTF-8?B?ZXJuZWwgKFRQKRtTYW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2Fy?= =?UTF-8?B?ZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170627160930epcas2p49fe543210e188c222b6a0eb6c73f14ae X-RootMTR: 20170627160930epcas2p49fe543210e188c222b6a0eb6c73f14ae References: <1498579734-1594-1-git-send-email-thierry.escande@collabora.com> <1498579734-1594-4-git-send-email-thierry.escande@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org W dniu 27.06.2017 o 18:08, Thierry Escande pisze: > This patch modifies the s5p_jpeg_parse_hdr() function so it only > modifies the passed s5p_jpeg_q_data structure if the jpeg header parsing > is successful. > > Signed-off-by: Thierry Escande Acked-by: Andrzej Pietrasiewicz > --- > drivers/media/platform/s5p-jpeg/jpeg-core.c | 38 ++++++++++++++++------------- > 1 file changed, 21 insertions(+), 17 deletions(-) > > diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c > index 0d935f5..df3e5ee 100644 > --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c > +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c > @@ -1206,22 +1206,9 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result, > break; > } > } > - result->w = width; > - result->h = height; > - result->sos = sos; > - result->dht.n = n_dht; > - while (n_dht--) { > - result->dht.marker[n_dht] = dht[n_dht]; > - result->dht.len[n_dht] = dht_len[n_dht]; > - } > - result->dqt.n = n_dqt; > - while (n_dqt--) { > - result->dqt.marker[n_dqt] = dqt[n_dqt]; > - result->dqt.len[n_dqt] = dqt_len[n_dqt]; > - } > - result->sof = sof; > - result->sof_len = sof_len; > - result->size = result->components = components; > + > + if (notfound || !sos) > + return false; > > switch (subsampling) { > case 0x11: > @@ -1240,7 +1227,24 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result, > return false; > } > > - return !notfound && sos; > + result->w = width; > + result->h = height; > + result->sos = sos; > + result->dht.n = n_dht; > + while (n_dht--) { > + result->dht.marker[n_dht] = dht[n_dht]; > + result->dht.len[n_dht] = dht_len[n_dht]; > + } > + result->dqt.n = n_dqt; > + while (n_dqt--) { > + result->dqt.marker[n_dqt] = dqt[n_dqt]; > + result->dqt.len[n_dqt] = dqt_len[n_dqt]; > + } > + result->sof = sof; > + result->sof_len = sof_len; > + result->size = result->components = components; > + > + return true; > } > > static int s5p_jpeg_querycap(struct file *file, void *priv, >