From patchwork Tue Jun 11 16:24:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ra=C3=BAl_S=C3=A1nchez_Siles?= X-Patchwork-Id: 250571 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 7D7382C02BB for ; Wed, 12 Jun 2013 02:24:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 13E7A31774; Tue, 11 Jun 2013 16:24:23 +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 mKsa+pogbSOS; Tue, 11 Jun 2013 16:24:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B9BAE30771; Tue, 11 Jun 2013 16:24:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2FCC28F7A4 for ; Tue, 11 Jun 2013 16:24:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 03087857DB for ; Tue, 11 Jun 2013 16:24:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q4tns0QWLaxA for ; Tue, 11 Jun 2013 16:24:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id D8B1B8278A for ; Tue, 11 Jun 2013 16:24:18 +0000 (UTC) Received: by mail-wi0-f181.google.com with SMTP id hq4so2089113wib.2 for ; Tue, 11 Jun 2013 09:24:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:content-transfer-encoding:user-agent; bh=Lz3O1NfktsEm0mj/rQj66npYQGmhxLEeL+a+48ItcB4=; b=ssiLuEMfHTAkNt+G1QK4CEZY3G3OjamgQBZ3ZApgS8ZYQ3vWJjkveMwHVhAcVXqttm 4l+jnZGUMqIwHYlWCeLBFYG+mjjloYlAeEViPVFXIPC3L0CWY9OMEHHfX2V3BBCtK8P7 3iBhWr/ZpjQ60mWCDRddKU9gmWDDe/NID7D9M9sqSb8NEApPoFQSBwtp/zl+aPzv5euu JuUqQ32JUgNpO/tlmXvfY+PqRwVG604MCl3nKC+ziqowtWxO/9HuWpmSgdF4aL04cfyD n4NNF3f3VzvD5auYw+ZllQaG621KqsfpwS0uMFmMLkFsV7kIyB68HvxiOwzAi+RDKYKV 0OrA== X-Received: by 10.194.21.231 with SMTP id y7mr1958091wje.94.1370967856992; Tue, 11 Jun 2013 09:24:16 -0700 (PDT) Received: from trismegisto.universo (120.1.219.87.dynamic.jazztel.es. [87.219.1.120]) by mx.google.com with ESMTPSA id b19sm18703961wik.10.2013.06.11.09.24.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Jun 2013 09:24:16 -0700 (PDT) Date: Tue, 11 Jun 2013 18:24:12 +0200 From: "=?iso-8859-1?Q?Ra=FAl_S=E1nchez?= Siles" To: buildroot@busybox.net Message-ID: <20130611162412.GE18264@trismegisto.universo> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [Buildroot] [PATCH 1/1] busybox: Add upstream patch to avoid occasional mdev SIGSEGV. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This implies rename of previous patch for a correct patch ordering. Signed-off-by: Raúl Sánchez Siles --- ...21.0-mdev.patch => busybox-1.21.0-mdev_1.patch} | 0 .../busybox-1.21.0-mdev_2_check_ACTION.patch | 32 ++++++++++++++++++++ 2 files changed, 32 insertions(+) rename package/busybox/1.21.0/{busybox-1.21.0-mdev.patch => busybox-1.21.0-mdev_1.patch} (100%) create mode 100644 package/busybox/1.21.0/busybox-1.21.0-mdev_2_check_ACTION.patch diff --git a/package/busybox/1.21.0/busybox-1.21.0-mdev.patch b/package/busybox/1.21.0/busybox-1.21.0-mdev_1.patch similarity index 100% rename from package/busybox/1.21.0/busybox-1.21.0-mdev.patch rename to package/busybox/1.21.0/busybox-1.21.0-mdev_1.patch diff --git a/package/busybox/1.21.0/busybox-1.21.0-mdev_2_check_ACTION.patch b/package/busybox/1.21.0/busybox-1.21.0-mdev_2_check_ACTION.patch new file mode 100644 index 0000000..f731cc0 --- /dev/null +++ b/package/busybox/1.21.0/busybox-1.21.0-mdev_2_check_ACTION.patch @@ -0,0 +1,32 @@ +From d35cbad0efaa57bf7c5280e62825966f7757906a Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Tue, 02 Apr 2013 12:37:06 +0000 +Subject: mdev: call index_in_strings on $ACTION only after we checked it for NULL + +Signed-off-by: Denys Vlasenko +--- +diff --git a/util-linux/mdev.c b/util-linux/mdev.c +index 5fe6bbb..1d74136 100644 +--- a/util-linux/mdev.c ++++ b/util-linux/mdev.c +@@ -1060,15 +1060,15 @@ int mdev_main(int argc UNUSED_PARAM, char **argv) + * ACTION can be "add", "remove", "change" + * DEVPATH is like "/block/sda" or "/class/input/mice" + */ +- action = getenv("ACTION"); +- op = index_in_strings(keywords, action); + env_devname = getenv("DEVNAME"); /* can be NULL */ +- env_devpath = getenv("DEVPATH"); + G.subsystem = getenv("SUBSYSTEM"); ++ action = getenv("ACTION"); ++ env_devpath = getenv("DEVPATH"); + if (!action || !env_devpath /*|| !G.subsystem*/) + bb_show_usage(); + fw = getenv("FIRMWARE"); + seq = getenv("SEQNUM"); ++ op = index_in_strings(keywords, action); + + my_pid = getpid(); + open_mdev_log(seq, my_pid); +-- +cgit v0.9.1