From patchwork Fri Sep 8 07:52:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Schonken X-Patchwork-Id: 811371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NvBlLdEo"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xpV0M4TP9z9s71 for ; Fri, 8 Sep 2017 17:52:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 540DA87AC3; Fri, 8 Sep 2017 07:52:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SY_fhTe3OZd0; Fri, 8 Sep 2017 07:52:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4EB5487A5E; Fri, 8 Sep 2017 07:52:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7615C1C1190 for ; Fri, 8 Sep 2017 07:52:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7032B264D6 for ; Fri, 8 Sep 2017 07:52:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MT5XwMsmL6sF for ; Fri, 8 Sep 2017 07:52:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by silver.osuosl.org (Postfix) with ESMTPS id 6707525E94 for ; Fri, 8 Sep 2017 07:52:13 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id f4so1174831wmh.4 for ; Fri, 08 Sep 2017 00:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=P4O9X0SeLMT7Y7TjkRVBZS/x7gj/FH4m5etu2nfX1YI=; b=NvBlLdEoJXUgKUowU+xJWRNLxGn5U16uYVkdhL1BfabJuSoogf5/EIggV+D/ICEzkK kggxNO4cmlZ6L/2OKaO8gyW88vSoe6cFiORKcjcqigc8Xs/pM5/KPSMFOyU7TWxKGZ3m JKriv2CBEFjGFzCs+Y7Y19Oov13LGeVxFX79JQ45BRrC339Cwmu3vA9h2BPsusXVlqAn Z+JVjPMuaB/XMV0kYLklmiPr+JFk3+0x/1ho+KceAApfB2iDHH2Rc3brko56TYxL53Pt hQSHIRdxwVbS6mtM3zUtRVUDWQBYwsTLpjkI+9VskTZhHpUeN6oPErmIBd9KvzWdxMhP V6rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=P4O9X0SeLMT7Y7TjkRVBZS/x7gj/FH4m5etu2nfX1YI=; b=jcIIFcFh2kwM3hPOt7hI0eJSS/YJme5uJaoY+6e49qxjhTvDAn+hb8Ik6pJWC2G7Xp 5qUNbwgbFPTRIWz820nHk6+u286hDF/HbtTmHZ9oZrqS0+M4H/U0YtmOk3GW9z+vngdP 7ZL1JHC+cGf/uBAwrJuxLmEZ1de/OsEdCr5dN/Dcw3G+VB9obNh9yJ/7UgVA8iuGzbYE RnMOcMR99UXidtj/AQ73NpzJ2Ud49j4sksPqaapu6oueLV0otFmexU1R53rzRe3OsXxh VTf5JRPwWAVnrUdvX1BUP2tv8ukngIpUBTTW03gDOEMvV8jdJYC8jxjxPmy6IHQWa7HC 6Yzw== X-Gm-Message-State: AHPjjUh/4zSEVNHh6aWcAwGLT57WHDS+MDNSLYEhkm2SQcRZWQdzlCqv 2Cc/oSxlfUUEBoQI+ffTusFHgw== X-Google-Smtp-Source: AOwi7QDY2jLXOf4Y+89b7R1sQSsQ11AmmRte28ZIxOWZZE5wHMLXXLni15wDRQQxbWjGNUa2Cc2JSg== X-Received: by 10.28.144.1 with SMTP id s1mr1157562wmd.142.1504857131388; Fri, 08 Sep 2017 00:52:11 -0700 (PDT) Received: from localhost.localdomain ([41.169.36.129]) by smtp.gmail.com with ESMTPSA id m189sm490056wmb.21.2017.09.08.00.52.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 00:52:10 -0700 (PDT) From: Olivier Schonken To: buildroot@buildroot.org Date: Fri, 8 Sep 2017 09:52:17 +0200 Message-Id: <20170908075217.4900-1-olivier.schonken@gmail.com> X-Mailer: git-send-email 2.11.0 Cc: Olivier Schonken Subject: [Buildroot] [PATCHv2 1/1] openjpeg: Fix malloc poison issue X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The malloc poison issue has been fixed upstream, this patch will thus only be temporary. Fixes the following autobuild issues sparc | http://autobuild.buildroot.net/results/c1b7a316ca2a4db49023f304dbc7fd5fed05bd9d bfin | http://autobuild.buildroot.net/results/031ece7a72e76a9155938cb283de859bd12a8171 sh4 | http://autobuild.buildroot.net/results/88664451f71c12ccd94e874d408fbb680bea1695 xtensa | http://autobuild.buildroot.net/results/fbede64a5a86d4868b6da0ab1275e75803235af0 powerpc | http://autobuild.buildroot.net/results/6c641650509048039b18fbeb010dbca0f0fc5292 microblazeel | http://autobuild.buildroot.net/results/fa2d5272b2db73cbfa441ead9250157c5626ab15 mips64el | http://autobuild.buildroot.net/results/fc96f6628f71e05d9a74e0e13e50178d29a2c495 sh4 | http://autobuild.buildroot.net/results/a6d6a6dcb9b4fa250edaaf5935762c5820457b23 x86_64 | http://autobuild.buildroot.net/results/47b4ca2cc661582d86830b9353a6c8af86e4ba35 arc | http://autobuild.buildroot.net/results/08e2e4eca6c3dbde8116a649dbf46e52ded45d10 arc | http://autobuild.buildroot.net/results/899fa044aab7ee28acfa71544f2105da4a5c97d5 arm | http://autobuild.buildroot.net/results/6016f6885b21d6e8c6199a6833c7acce6210ecc6 arm | http://autobuild.buildroot.net/results/adbb3c76497e89161535c711de98809a0fa168a7 or1k | http://autobuild.buildroot.net/results/de3ef69a72d2c2082e202fbed702c53a51274fef mips64el | http://autobuild.buildroot.net/results/39b186b13001a810e0992b52321f1015b445d2fd x86_64 | http://autobuild.buildroot.net/results/22c6a29a1ded6aedf01adfdfcf26302248dba80c arm | http://autobuild.buildroot.net/results/b62c54b727eb5f576c4a517a69c495b537c3b69a m68k | http://autobuild.buildroot.net/results/a826561c5786be5f0088b50b633210593e23ffff arm | http://autobuild.buildroot.net/results/d32ec927a5e4d5644cb3641014bcf6ebe5c14490 Signed-off-by: Olivier Schonken Tested-by: Bernd Kuhls --- Fix malloc poison issue to remove all uclibc related error from autobuild. Will investigate threads and C++ issue further with less autobuild failures .../0003-avoid-malloc-poisoning-issue.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/openjpeg/0003-avoid-malloc-poisoning-issue.patch diff --git a/package/openjpeg/0003-avoid-malloc-poisoning-issue.patch b/package/openjpeg/0003-avoid-malloc-poisoning-issue.patch new file mode 100644 index 0000000000..8463e20d6d --- /dev/null +++ b/package/openjpeg/0003-avoid-malloc-poisoning-issue.patch @@ -0,0 +1,54 @@ +From 51a1dcaa6ed5713520dca36fc58cd9240c08b7ca Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Thu, 7 Sep 2017 17:52:59 +0200 +Subject: [PATCH] Avoid malloc poisoning issue when including of + uclibc (#1013) + +Signed-off-by: Olivier Schonken +--- + src/lib/openjp2/thread.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/lib/openjp2/thread.c b/src/lib/openjp2/thread.c +index 8b56aa4d5..af33c2c80 100644 +--- a/src/lib/openjp2/thread.c ++++ b/src/lib/openjp2/thread.c +@@ -29,9 +29,6 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#include "opj_includes.h" +- +-#include "thread.h" + #include + + #ifdef MUTEX_win32 +@@ -46,6 +43,8 @@ + #include + #include + ++#include "opj_includes.h" ++ + OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void) + { + return OPJ_TRUE; +@@ -289,6 +288,10 @@ void opj_thread_join(opj_thread_t* thread) + #include + #include + ++/* Moved after all system includes, and in particular pthread.h, so as to */ ++/* avoid poisoning issuing with malloc() use in pthread.h with ulibc (#1013) */ ++#include "opj_includes.h" ++ + OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void) + { + return OPJ_TRUE; +@@ -425,6 +428,8 @@ void opj_thread_join(opj_thread_t* thread) + #else + /* Stub implementation */ + ++#include "opj_includes.h" ++ + OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void) + { + return OPJ_FALSE;