From patchwork Fri Jul 25 14:20:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 25041 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XAgNB-0003Fe-Se; Fri, 25 Jul 2014 16:21:25 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1XAgN9-00046Q-2M; Fri, 25 Jul 2014 16:21:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760374AbaGYOVT (ORCPT + 1 other); Fri, 25 Jul 2014 10:21:19 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:33012 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760297AbaGYOVS (ORCPT ); Fri, 25 Jul 2014 10:21:18 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N99003NNUJGLH10@mailout3.samsung.com>; Fri, 25 Jul 2014 23:21:16 +0900 (KST) X-AuditID: cbfee61b-f79f86d00000144c-e8-53d267dccf05 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id A6.8F.05196.CD762D35; Fri, 25 Jul 2014 23:21:16 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N99004WBUIW3L00@mmp2.samsung.com>; Fri, 25 Jul 2014 23:21:16 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org, j.anaszewski@samsung.com, Sylwester Nawrocki Subject: [PATCH v3 3/9] s5p-jpeg: return error immediately after get_byte fails Date: Fri, 25 Jul 2014 16:20:47 +0200 Message-id: <1406298053-30184-4-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1406298053-30184-1-git-send-email-s.nawrocki@samsung.com> References: <1406298053-30184-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMJMWRmVeSWpSXmKPExsVy+t9jQd076ZeCDT6d1LLovfqc0aJnw1ZW ixnn9zFZHH7TzurA4tG3ZRWjx+dNcgFMUVw2Kak5mWWpRfp2CVwZ0++tYi+Yw1HRucm1gfEK WxcjJ4eEgInE5JYPTBC2mMSFe+uB4lwcQgLTGSVufJ/NCOF0MElcaprMClLFJmAo0Xu0jxHE FhGQl3jSewNsErNAnsTXT8/BJgkL+EtcON/BDmKzCKhKLJn8iQXE5hVwk5i37SjQHA6gbQoS cybZgJicAu4Sh6ZZgVQIAVWsXvqWaQIj7wJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5uZsY wUHxTHoH46oGi0OMAhyMSjy8HfUXg4VYE8uKK3MPMUpwMCuJ8BrFXwoW4k1JrKxKLcqPLyrN SS0+xCjNwaIkznuw1TpQSCA9sSQ1OzW1ILUIJsvEwSnVwMiQb7MxsrZI65q0rSLn8dD8izz3 lRiTLffnTH+f17B40drKojnd9SunqK/f7S0f48ElZ8px/YF3/T8Pzs1dUwwn37qvwJIxR0ww 5/aCjemirAESUzZ9Lw0qOTBz0pP0r9UCzQrGUYuudC031mY/76Zc/KtoeuCK1YK5uYyTTmk8 9OpKCDT/p8RSnJFoqMVcVJwIAIeD/vgGAgAA Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.7.25.140918 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_SUBJ_A 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Jacek Anaszewski When parsing JPEG header s5p_jpeg_parse_hdr function should return immediately in case there was an error while reading a byte. Signed-off-by: Jacek Anaszewski Signed-off-by: Sylwester Nawrocki --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 126199e..a3f8862 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -906,14 +906,14 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result, while (notfound) { c = get_byte(&jpeg_buffer); if (c == -1) - break; + return false; if (c != 0xff) continue; do c = get_byte(&jpeg_buffer); while (c == 0xff); if (c == -1) - break; + return false; if (c == 0) continue; length = 0;