From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-f65.google.com (mail-yw1-f65.google.com [209.85.161.65]) by mail.openembedded.org (Postfix) with ESMTP id 93F047BFF9 for ; Wed, 16 Jan 2019 12:00:57 +0000 (UTC) Received: by mail-yw1-f65.google.com with SMTP id h193so2361518ywc.4 for ; Wed, 16 Jan 2019 04:00:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zl7kaL4vuBOzcZI7Y60o6YbTr/KKLJilyQzZt8t/lUk=; b=r16/9sxWgFmGnhqFDC25khyEYy+uBxG2yedDJ4SDYczz4vUGSb8sc75gdA8+K88p2F mIUTJLKGEPTObdcosWbeRPKUXA1HN5uFWhEwSwZNGf08Y3zae2v8Oqud0XuVRk3ee6bH S9UznAerK0que1caSgKK27ENgcQ/l9zkztqtGSULCD+yFdIN6Zp93+sLaTFExPYag2PJ yR4HqmUnk8lrAypYhxBN8aYBDpT4oKOPSQfwop7K4f5MajrkKVxr30icaeY09eKO+yNI 171xhV3812V5HB0L2KQMgjUX/q8D/9pgMVCFlsGBTy2WpDNDHAcXpqws34AOL4JcdSic yQ/A== X-Gm-Message-State: AJcUukcubcCmwYaf66sPiqt9plu8mJCPpbJIK6DW9yd7yMJHsCj1FnIb REofK5Fj5fKpwIbtNVJQWjihF0XH X-Google-Smtp-Source: ALg8bN5q342A/2ia+UrifLvg29CmDe5vDP/IBWHuFAe5T5mSrAglAL9iqnxMxVuJjSETDsmn/fgTJQ== X-Received: by 2002:a81:4842:: with SMTP id v63mr6972625ywa.455.1547640058332; Wed, 16 Jan 2019 04:00:58 -0800 (PST) Received: from tfsielt31850.garage.tyco.com ([77.107.218.170]) by smtp.gmail.com with ESMTPSA id o124sm2169655ywe.75.2019.01.16.04.00.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 04:00:57 -0800 (PST) From: =?UTF-8?q?Andr=C3=A9=20Draszik?= To: openembedded-core@lists.openembedded.org Date: Wed, 16 Jan 2019 12:00:38 +0000 Message-Id: <20190116120051.12182-3-git@andred.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190116120051.12182-1-git@andred.net> References: <20190114125632.4780-1-git@andred.net> <20190116120051.12182-1-git@andred.net> MIME-Version: 1.0 Subject: [PATCH v3 02/15] util-linux: remove erroneous patch (qsort_r) X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 12:00:57 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: André Draszik The patch in question is patching the code to use qsort() instead of qsort_r(), without adopting the compare function. This is a major issue, because the compare function as written is evaluating / accessing a third argument, which is not passed with this OE patch, causing access to random memory. Given this patch was added so as to support (old) linux (host) distros which might not provide qsort_r(), according to the git history, and given these days util-linux detects availability of qsort_r() during configure phase, and given musl builds (which doesn't provide qsort_r() either) work without problem, the right solution is to simply drop this invalid patch. Do so. Signed-off-by: André Draszik --- .../util-linux/util-linux-native-qsort.patch | 33 ------------------- .../util-linux/util-linux_2.32.1.bb | 6 ---- 2 files changed, 39 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch deleted file mode 100644 index 68bf22de8c..0000000000 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Wed, 26 Mar 2014 01:30:29 +0000 -Subject: [PATCH] sun.c: use qsort() to instead of qsort_r() - -qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on -the host like CentOS 5.x. - -Upstream-Status: Inappropriate [Other] - -Signed-off-by: Robert Yang ---- - libfdisk/src/sun.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -Index: util-linux-2.24.2/libfdisk/src/sun.c -=================================================================== ---- util-linux-2.24.2.orig/libfdisk/src/sun.c -+++ util-linux-2.24.2/libfdisk/src/sun.c -@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f - } - verify_sun_starts = starts; - -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -- -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), -+ (int (*)(const void *,const void *)) verify_sun_cmp); -+ - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined.")); - return 0; diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index b0492afff3..0f860c221b 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,14 +1,8 @@ require util-linux.inc -# To support older hosts, we need to patch and/or revert -# some upstream changes. Only do this for native packages. -OLDHOST = "" -OLDHOST_class-native = "file://util-linux-native-qsort.patch" - SRC_URI += "file://configure-sbindir.patch \ file://runuser.pamd \ file://runuser-l.pamd \ - ${OLDHOST} \ file://ptest.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ -- 2.20.1