{"id":812887,"url":"http://patchwork.ozlabs.org/api/patches/812887/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1505227539-17560-6-git-send-email-jjhiblot@ti.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505227539-17560-6-git-send-email-jjhiblot@ti.com>","list_archive_url":null,"date":"2017-09-12T14:45:34","name":"[U-Boot,v5,05/10] lzo: add a function to check the validity of the header","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c4eaacb2ba643120032fe85bd8a4877a7d3862e2","submitter":{"id":70508,"url":"http://patchwork.ozlabs.org/api/people/70508/?format=json","name":"Jean-Jacques Hiblot","email":"jjhiblot@ti.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1505227539-17560-6-git-send-email-jjhiblot@ti.com/mbox/","series":[{"id":2721,"url":"http://patchwork.ozlabs.org/api/series/2721/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=2721","date":"2017-09-12T14:45:29","name":"spl: dm: Make it possible for the SPL to pick its own DTB from a FIT","version":5,"mbox":"http://patchwork.ozlabs.org/series/2721/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812887/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812887/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ti.com header.i=@ti.com header.b=\"RmcvMMy3\";\n\tdkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xs73K6p5tz9s7g\n\tfor ;\n\tWed, 13 Sep 2017 00:49:01 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 93F16C21FC3; Tue, 12 Sep 2017 14:48:06 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 8B596C221FA;\n\tTue, 12 Sep 2017 14:46:08 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid A1750C2209D; Tue, 12 Sep 2017 14:45:52 +0000 (UTC)","from lelnx194.ext.ti.com (lelnx194.ext.ti.com [198.47.27.80])\n\tby lists.denx.de (Postfix) with ESMTPS id 972A3C2202A\n\tfor ; Tue, 12 Sep 2017 14:45:48 +0000 (UTC)","from dlelxv90.itg.ti.com ([172.17.2.17])\n\tby lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v8CEjjDZ024391; \n\tTue, 12 Sep 2017 09:45:45 -0500","from DLEE101.ent.ti.com (dlee101.ent.ti.com [157.170.170.31])\n\tby dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CEjjT2012482; \n\tTue, 12 Sep 2017 09:45:45 -0500","from DLEE100.ent.ti.com (157.170.170.30) by DLEE101.ent.ti.com\n\t(157.170.170.31) with Microsoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34;\n\tTue, 12 Sep 2017 09:45:45 -0500","from dlep33.itg.ti.com (157.170.170.75) by DLEE100.ent.ti.com\n\t(157.170.170.30) with Microsoft SMTP Server (version=TLS1_0,\n\tcipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend\n\tTransport; Tue, 12 Sep 2017 09:45:45 -0500","from localhost (ileax41-snat.itg.ti.com [10.172.224.153])\n\tby dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CEjiQ6003002;\n\tTue, 12 Sep 2017 09:45:44 -0500"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,\n\tT_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com;\n\ts=ti-com-17Q1; t=1505227545;\n\tbh=IGUALYn1QJVlYc0fUxLeqliUmbVrPL3Agev9C3LOWNM=;\n\th=From:To:CC:Subject:Date:In-Reply-To:References;\n\tb=RmcvMMy3yJUh+b6dptbkcCVSEZUdola//AXybvdBSTsbliF1mlJY3aqvXegKzFsSp\n\tN8QXChCIX4GI6GucMS9CF4WTQmgkH2cAmkJmkK96xOFihdxy9Ko2uguW959C+azScI\n\tqUL/jFonDIMFdWxlwzTYR3wvmwBhv06dSlWQqtuw=","From":"Jean-Jacques Hiblot ","To":", , ,\n\t","Date":"Tue, 12 Sep 2017 16:45:34 +0200","Message-ID":"<1505227539-17560-6-git-send-email-jjhiblot@ti.com>","X-Mailer":"git-send-email 1.9.1","In-Reply-To":"<1505227539-17560-1-git-send-email-jjhiblot@ti.com>","References":"<1505227539-17560-1-git-send-email-jjhiblot@ti.com>","MIME-Version":"1.0","X-EXCLAIMER-MD-CONFIG":"e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180","Cc":"u-boot@lists.denx.de","Subject":"[U-Boot] [PATCH v5 05/10] lzo: add a function to check the validity\n\tof the header","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"Signed-off-by: Jean-Jacques Hiblot \nReviewed-by: Tom Rini \nReviewed-by: Simon Glass \n---\n include/linux/lzo.h | 3 +++\n lib/lzo/lzo1x_decompress.c | 21 +++++++++++++++++----\n 2 files changed, 20 insertions(+), 4 deletions(-)","diff":"diff --git a/include/linux/lzo.h b/include/linux/lzo.h\nindex 88687fa..8981d04 100644\n--- a/include/linux/lzo.h\n+++ b/include/linux/lzo.h\n@@ -31,6 +31,9 @@ int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,\n int lzop_decompress(const unsigned char *src, size_t src_len,\n \t\t unsigned char *dst, size_t *dst_len);\n \n+/* check if the header is valid (based on magic numbers) */\n+bool lzop_is_valid_header(const unsigned char *src);\n+\n /*\n * Return values (< 0 = Error)\n */\ndiff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c\nindex ccc90b8..65fef0b 100644\n--- a/lib/lzo/lzo1x_decompress.c\n+++ b/lib/lzo/lzo1x_decompress.c\n@@ -30,16 +30,29 @@ static const unsigned char lzop_magic[] = {\n \n #define HEADER_HAS_FILTER\t0x00000800L\n \n-static inline const unsigned char *parse_header(const unsigned char *src)\n+\n+bool lzop_is_valid_header(const unsigned char *src)\n {\n-\tu16 version;\n \tint i;\n-\n \t/* read magic: 9 first bytes */\n \tfor (i = 0; i < ARRAY_SIZE(lzop_magic); i++) {\n \t\tif (*src++ != lzop_magic[i])\n-\t\t\treturn NULL;\n+\t\t\treturn false;\n \t}\n+\treturn true;\n+}\n+\n+static inline const unsigned char *parse_header(const unsigned char *src)\n+{\n+\tu16 version;\n+\tint i;\n+\n+\tif (!lzop_is_valid_header(src))\n+\t\treturn NULL;\n+\n+\t/* skip header */\n+\tsrc += 9;\n+\n \t/* get version (2bytes), skip library version (2),\n \t * 'need to be extracted' version (2) and\n \t * method (1) */\n","prefixes":["U-Boot","v5","05/10"]}