From patchwork Tue Aug 21 14:56:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 960474 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=googlegroups.com (client-ip=2a00:1450:4864:20::439; helo=mail-wr1-x439.google.com; envelope-from=swupdate+bncbdjllh4stydrbj6q6dnqkgqedci6z7y@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="RkfMzHd2"; dkim-atps=neutral Received: from mail-wr1-x439.google.com (mail-wr1-x439.google.com [IPv6:2a00:1450:4864:20::439]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vtzv2ljvz9s3x for ; Wed, 22 Aug 2018 00:56:42 +1000 (AEST) Received: by mail-wr1-x439.google.com with SMTP id z17-v6sf16151720wrr.16 for ; Tue, 21 Aug 2018 07:56:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1534863399; cv=pass; d=google.com; s=arc-20160816; b=IgElKiehprCb5Lx3K6g9cUy8qz9sZohLG3R4wWUFlUN+KDGHKQ8oTxPjKInM8rRac+ iyN9ZcHsv9y/H7THhxNtIDnjnOeFd8g7boVJy8Laqqc778/WjLJ4WahpSeMhdNA+715R jR4n98Twi8+ne4cAWR+6KA5gh763ZubsnqN3/B/zbPJxJZaoxmaCTQPMRYtj8hDGnHLZ C8syktOFkBtkiQl/NMjIQ4CKdKf/Ufgi8rlbrcSAqqx9lod/xxxcY0d/36OzCJC69NiE MNqs4V9ZCivljpcak4zBHQf/faJNqtnfckWT1fgUa2cfcWFFTmY0DsfdJj6fz9VnxR7y j6aQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:mime-version :sender:dkim-signature:arc-authentication-results; bh=P3LYNkfeP/QI/76EhErtslKoq5kvu6LWSeJ3XIt5osg=; b=mXFoe0YZ5onNb0wD+oG+6iLccSQpwR+0oMaBJ6DRLx3Yl6RtaBB4wiLElbgUl5p8u+ xhVKGOvQ1GJOjOQdQlSoWAat9PtlYdZ3WodNbjwh8QkD13OvtZvPCr5zPD4i4S2h1htZ vI8a6A1+9iOV3bwzPOQSRicHH5svSXbPufDj1je6H/xS05hMeONHFRPOwnXkw5OsTwAD CHnpvc8Rfj30HfNDvnJ5szMRcvt0JFLKZJ8QMLFxf2biL8W6seHAbnXRoUf5fiAuDaSX 6Fl36JbOV0eHhO1TjPspOK242ysIuUAj59k25TWXLct4fBvRnudCkg5KXtkhrh61qPJX nKfg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@mind-be.20150623.gappssmtp.com header.s=20150623 header.b="eyr0pSN/"; spf=softfail (google.com: domain of transitioning arnout.vandecappelle@essensium.com does not designate 2a00:1450:4864:20::52c as permitted sender) smtp.mailfrom=arnout.vandecappelle@essensium.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=P3LYNkfeP/QI/76EhErtslKoq5kvu6LWSeJ3XIt5osg=; b=RkfMzHd2s2QcYDvtCirBXI1R3M3WaWWMuq5chWluA3BPwTvcVlOI3ygR3r6dpQiCai nQm7C9bUzrm4exvYt5LMjtUXUMEfpIosLeOt66ByHp0QV54XAeCwF/RYer7FUQoTRzhq kB+MADUINItJUf75tPjCTiX3zfQSfCOzt0/GxjgH3H8kdZGIwcsbB6LIHBH2Y3CFs5o6 NZReCxSzRr5PgbI/XfrZAIFW2msvCwJsGFPHtr4VB/pWp9GCyxJ3UBXIPNqujUbGHPc+ C6ga+uAKa6VHNwFuYhCmax/GK4m80HFnSrbbf44WQ9UHviBklQ9fZ+/J0NIveL/lyik+ kWTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=P3LYNkfeP/QI/76EhErtslKoq5kvu6LWSeJ3XIt5osg=; b=fE0d+taNTFNPhJpWeX/wC2oILnp74Y1oPAY5vQnJLYgBbqa63HjQJ0NsC9ZlC4ywa9 yQZrd/SFzW05A8iHZ+nicZnP63x5yXCFSsOFz3ldBC6P9ZS7QDdQTrsLWDff2NOiGo5o oAu0Ay/0ZmhVN6JDzKvPyAr+7bf4Bf0mEcmt9bNs++9WaS9IIDIq6GY1mM9BUQ8kfJdp 8X1sFycfWL2AozNcUV7IiX6jgUkLYmAfGEKUxAygBaGQl0zWEMlFyWlbMbqg6qggH8p5 If5jjEqa2LPG2hWbmxxricN9uCMOZsIbAzRt+haAJwevsCdXlgd8aNQaDi9+lVj+37Hr bgbg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOUpUlEyjwpnmkfVP7370kKRrSMlsnjeWYMAWFr+vGdbpc9x3x6HTuks dGz2bjc3Emd1kWcxYCLVOew= X-Google-Smtp-Source: AA+uWPyFM1yMKH1Zk59ajvkmbZ56MUUUv6qbRRw9FYvInyjTbNAMf15WyybrgaHSofGSaPqhZks9fA== X-Received: by 2002:adf:8202:: with SMTP id 2-v6mr508837wrb.7.1534863399417; Tue, 21 Aug 2018 07:56:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:f28e:: with SMTP id k14-v6ls5027723wro.6.gmail; Tue, 21 Aug 2018 07:56:38 -0700 (PDT) X-Received: by 2002:a5d:5201:: with SMTP id j1-v6mr201752wrv.30.1534863398781; Tue, 21 Aug 2018 07:56:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534863398; cv=none; d=google.com; s=arc-20160816; b=lcZ/p6W7/0eiBkJSBZc5N7igmvlZXpzsFiz27t/MSLBgq6VmvkRgbh/ErRogbOunIG O8OzVxgAZ3r/GatpKOer65wDk86p06EUJ8NQnpCa5kQb+dlGdRHVltXDpH9GlZqdTfS+ YllXPp2CUr3HK76gRwucrO38bgEM7Ay5lz2+MZ/GRxKMXeu2D0FqRvB4hl2MJHZHVcRR LlDZ1/0APS1sHODTGGKClJqzjLXs/Af/52kvIIh4uvw75PTfdwH5k6uAOgtEsNGlaFB4 9Uf/5jCSEX5wYQUCizRj1GdqSJ9c0W3+yllu3JEr9b4xQg6lMe3KVvARjy5DyxLoGuo4 hF6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=UVctyQ9OcOSZclqzOfBKDlM57VGhPqOHmRCwfKrJfDk=; b=dMpnKcUpzcraDszFWJEkTvcUpdAMMk0sCnIIHaH6gGo5h5n2cIMuugt1iyYHDryAD6 6sMRfRiO1vnMjwHF7Tis3bJihKcd4AVodJh9UlnUMbODnofT5zvBtqw4XfeK1VkGGYyq L79ZmV5x92FaPBU4LVdE1JM/B6mN2RqAKqN1euSGHf241OcUk5QPOaScMaZF+6oHzf9b Byjc2D6r1iiLft3V5AV41+bqC90VHRDyH7vm0Zq0eG9V+P4P3eOg6nCPL2H6yOxU4r/S 0pzsxEXju377rn8lA6XOtynXS22pl6jBNdCjcVovwqdst0Kuejf/SVizw+iCjUlLUcww qUlA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@mind-be.20150623.gappssmtp.com header.s=20150623 header.b="eyr0pSN/"; spf=softfail (google.com: domain of transitioning arnout.vandecappelle@essensium.com does not designate 2a00:1450:4864:20::52c as permitted sender) smtp.mailfrom=arnout.vandecappelle@essensium.com Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com. [2a00:1450:4864:20::52c]) by gmr-mx.google.com with ESMTPS id v18-v6si113842wmc.1.2018.08.21.07.56.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 07:56:38 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning arnout.vandecappelle@essensium.com does not designate 2a00:1450:4864:20::52c as permitted sender) client-ip=2a00:1450:4864:20::52c; Received: by mail-ed1-x52c.google.com with SMTP id e6-v6so10823590edr.2 for ; Tue, 21 Aug 2018 07:56:38 -0700 (PDT) X-Received: by 2002:a50:8dcb:: with SMTP id s11-v6mr59857563edh.86.1534863398187; Tue, 21 Aug 2018 07:56:38 -0700 (PDT) Received: from vandecaa-laptop.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id e25-v6sm1990465edd.35.2018.08.21.07.56.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 07:56:37 -0700 (PDT) From: "Arnout Vandecappelle (Essensium/Mind)" To: swupdate@googlegroups.com Cc: "Arnout Vandecappelle (Essensium/Mind)" Subject: [swupdate] [PATCH 1/2] mtd-interface: add UBIATTACH config option Date: Tue, 21 Aug 2018 16:56:29 +0200 Message-Id: <20180821145630.19389-1-arnout@mind.be> X-Mailer: git-send-email 2.18.0 X-Original-Sender: arnout@mind.be X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@mind-be.20150623.gappssmtp.com header.s=20150623 header.b="eyr0pSN/"; spf=softfail (google.com: domain of transitioning arnout.vandecappelle@essensium.com does not designate 2a00:1450:4864:20::52c as permitted sender) smtp.mailfrom=arnout.vandecappelle@essensium.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Attaching random MTD devices as a UBI device is potentially dangerous, because the kernel will start writing to it if it is found to be erased. This may e.g. destroy a bootloader on it. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Stefano Babic --- Some parts of the code are only relevant when UBIATTACH is enabled but are not #ifdef'ed away for simplicity. In particular, all the support code for blacklisting is not relevant. --- corelib/mtd-interface.c | 4 ++++ handlers/Config.in | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/corelib/mtd-interface.c b/corelib/mtd-interface.c index fa9c1f7..d9bd6d5 100644 --- a/corelib/mtd-interface.c +++ b/corelib/mtd-interface.c @@ -311,6 +311,7 @@ static void scan_for_ubi_devices(void) } } +#if defined(CONFIG_UBIATTACH) static void scan_ubi_partitions(int mtd) { struct flash_description *flash = get_flash_info(); @@ -371,6 +372,7 @@ static void scan_ubi_partitions(int mtd) scan_ubi_volumes(mtd_info); } #endif +#endif int scan_mtd_devices (void) { @@ -465,6 +467,7 @@ int scan_mtd_devices (void) */ scan_for_ubi_devices(); +#if defined(CONFIG_UBIATTACH) /* * Search for volumes in MTD that are not attached, default case */ @@ -476,6 +479,7 @@ int scan_mtd_devices (void) flash->mtd_info[i].mtd.type != MTD_UBIVOLUME) scan_ubi_partitions(i); } +#endif #endif return mtd_info->mtd_dev_cnt; diff --git a/handlers/Config.in b/handlers/Config.in index 1137acd..12a50b4 100644 --- a/handlers/Config.in +++ b/handlers/Config.in @@ -18,9 +18,22 @@ config UBIVOL comment "ubivol support needs libubi" depends on !HAVE_LIBUBI +config UBIATTACH + bool "Automatically attach UBI devices" + default y + depends on UBIVOL + help + If this option is enabled, swupdate will try to attach + UBI devices to all MTD devices. + + Make sure UBIBLACKLIST or UBIWHITELIST is set correctly, + since attaching a UBI device will write to it if it is + found to be empty, and that may destroy already existing + content on that device. + config UBIBLACKLIST string "List of MTD devices to be excluded for UBI" - depends on UBIVOL + depends on UBIATTACH help Define a list of MTD devices that are excluded by scan_mtd_device. The devices are still available @@ -31,7 +44,7 @@ config UBIBLACKLIST config UBIWHITELIST string "List of MTD devices that must have UBI" - depends on UBIVOL + depends on UBIATTACH help Define a list of MTD devices that are planned to have always UBI. If first attach fails, the device is erased @@ -43,7 +56,7 @@ config UBIWHITELIST config UBIVIDOFFSET int "VID Header Offset" - depends on UBIVOL + depends on UBIATTACH default 0 help Force UBI to set a VID header offset to be 2048 bytes From patchwork Tue Aug 21 14:56:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 960475 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=googlegroups.com (client-ip=2a00:1450:4864:20::43a; helo=mail-wr1-x43a.google.com; envelope-from=swupdate+bncbdjllh4stydrbl6q6dnqkgqewj3v4ea@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="g2lUMFiq"; dkim-atps=neutral Received: from mail-wr1-x43a.google.com (mail-wr1-x43a.google.com [IPv6:2a00:1450:4864:20::43a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vv023YtFz9s3x for ; Wed, 22 Aug 2018 00:56:50 +1000 (AEST) Received: by mail-wr1-x43a.google.com with SMTP id 4-v6sf4624682wra.18 for ; Tue, 21 Aug 2018 07:56:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1534863407; cv=pass; d=google.com; s=arc-20160816; b=AGB23d8F+FhKgi5xV8tjFu57MkwUnjgrG9/4MbhazE+HzDBG/e1uAGF9pSQuF98pc1 s+Ida9f7j8z+lgcWOQJb7c/4o4DE/Wrtna0DGXJT0Mi7gziaahC7c8l+wT5WKnCwylWS qv3LHm3y5MtbN2hDRfvLWMB/pvsdIe++KydLgx/u8gQd/WD3FwDAcg0Tj9vzMCi/PBg6 VmA8KxLqNTdM+DU6oHFaR23ABvTqt8r0gbMaoob1RVTxadQaR3Svv3CK35D47vaUP90P gqgIZYcg5YOW+Pmn/v0jGRp28o/UEnMQK8XBxr9wHCnvOlCOvg+UAwcR2bJzKd2dYqCJ vOuA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=ccRpOdKPkRXFRWBsqu0h2sLGwYszkdfdD0vpAemsndg=; b=VgZYmCY6f1kPjiVdBNJPyLofmC8jJasP7Seb0dsPADp96uDZaw+HmXuWJ1LN+DkF82 RSH/nxg+jhVuq1UNkYa2VMiWR2ZPo9BN8WByR07j6x6OIp48ega55wHJk3hP1O+DDO7y SbiaPeFhPaGmgdYTTWyKT73mnT1rI4yoWRJ0XK474wzpE5lgedUwO2MSqcAa27mtjqGl 20y/weXmryoRLpt5BO4me37DXGeRRXkhIXjrWgadGO8kABy4iCbpEP1MKLshsGJkXbH/ m8mT4UgaSlmuh0qKsm6pq4Bz61wVHm1uTbPK796iM+ShMRskh+MvHfqNJ0a2p56cXHem oQ7w== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@mind-be.20150623.gappssmtp.com header.s=20150623 header.b=NhoVNIJe; spf=softfail (google.com: domain of transitioning arnout.vandecappelle@essensium.com does not designate 2a00:1450:4864:20::52c as permitted sender) smtp.mailfrom=arnout.vandecappelle@essensium.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=ccRpOdKPkRXFRWBsqu0h2sLGwYszkdfdD0vpAemsndg=; b=g2lUMFiqo2wtaruIAdiqO8JLyzqSu24rTYmMIS9ZNT4YBHT69EMEH/VoGGGKN0AMs2 0R2c/B72dSHkyhJeR6aMCkcYO+iQTiOJW0JaBPBgSbsnja0cwXxLNYwMNIJix1924ouc JQFuAOa8p6OOAitHNJhec2pJcL4i594AFBRVkxnY4pUApNODahrzYmqHnz4luR3IYZdN pbWDfAByNhvRfMRR1Ero1UM5izcGRYRvhFV2WFme2NIPqxYrUoXA4aTMcsoESo3nyDCV 1kI23YdxFMP9+yuvhP7mYpNT7pwePUvPAGikfTuOoiqGUQ76P7du1A6yvUkJBjVtq4/U p7CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=ccRpOdKPkRXFRWBsqu0h2sLGwYszkdfdD0vpAemsndg=; b=r+3WLGaP51Nnlb9zgTzGwbMu7DgtEz8xl3RIbedgHMjw1w/qIMM6SbxHCda+eA0DEZ zK4Yi+8Dv2X5zUc4l79zt2dgDN73JOSRr9jcj5Bp7lLV22Vfa6BCVhd4Yf/6dgUEcCqS ptN6tTaw7qv+bN95RnzQ0C0ejM892ybfIvEVQY96btDVCS6iuo5fmZHVvCv8JK4C7hjk CwEO8veSD+o33UhxuNOQkvm880mBj45hZORqBbzThB4bF+wZeL1Z7oZmFrXwZCcRHTUw bAVTQrEEBD0N5swbNsKc3qH6kCaYCTV6OdnpONHesZ7Z8C3oJe5Y+4E/uYe3+EFaMDUZ XTAg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOUpUlEEQTi97HQXvMpWXriZL6CWVLLb4biXJeqbykDI0je5w9UcPwoP ZGBnBuUjVS6Lb6KCPKkmzcM= X-Google-Smtp-Source: AA+uWPzelFL4pu/ejpkfIWTE2uJwCqMsjsQep4rT5pbwb8kkdGdaow2iExeSGDJYM5UXc1UAkk/xUw== X-Received: by 2002:a5d:4343:: with SMTP id u3-v6mr504009wrr.5.1534863407865; Tue, 21 Aug 2018 07:56:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1c:f214:: with SMTP id s20-v6ls599428wmc.0.gmail; Tue, 21 Aug 2018 07:56:47 -0700 (PDT) X-Received: by 2002:a1c:2dd3:: with SMTP id t202-v6mr4324572wmt.19.1534863407260; Tue, 21 Aug 2018 07:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534863407; cv=none; d=google.com; s=arc-20160816; b=Eh7fjugExlRDdgr5P5fMLOXldvs9or7YSNigm2ZxKycCItt4+eaDmgoQA5Z+OdKlSx jZPfGukqZyN85ZvuQIWCMBPGvf1t4RzDxH/OEHGfz5qFe088uODrx6Dwjy2c/o6NH+er H54wbloGf0zs9S09144pCDg0R8aW719p937f0rZsbIoaBVTm64bIS8XfzVJ+s7leUKvF ac3KR97E7I2Sddh6al0CINDPq3f7Hj9YCi4zp9I/Z9hJ979RPXclED4ZafFBWMIRDrGN zIqX3DHTpwcI20oTyvZxzGEFma3ROzxlRRrCJg8UML/vPZYu7lbspiFAPVm7AuR5v45W YflA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=ShHMz5OWfsPuROPpC0Bdt2hP29tbUhNe2TTIpDLpUDc=; b=UDId/cq9qCaa1tXGGIbmijjKR/GlBl1hXczuANwCnYpi1kIigU/qbraonQuQWWbZd0 U9rwr/aXa3Ml+te+nufRqz2vTAJdO2SdHocsktHYSq8tl+bnAtHvpynNg2ppTGPXUNZO 1DEZWQEUKnCQU6BrQMOk0IFSHo+cEjY8AsZONvVQw//NJQdO8bb/EP39eaINXOcog9oL BPMbQEVo9iS7q8m/OQ8kPqWiDgd79mmx+j2si3vZ6aa1Q1Ha3J5WiEFioptVQoC9tzuT FTWyNtGeTBZEms4ubz9T6JqAeXl1Uej7LVBbegPeg6Qiy5CCHjJuwVNVlnycNEbfEO9k lFCQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@mind-be.20150623.gappssmtp.com header.s=20150623 header.b=NhoVNIJe; spf=softfail (google.com: domain of transitioning arnout.vandecappelle@essensium.com does not designate 2a00:1450:4864:20::52c as permitted sender) smtp.mailfrom=arnout.vandecappelle@essensium.com Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com. [2a00:1450:4864:20::52c]) by gmr-mx.google.com with ESMTPS id v18-v6si113842wmc.1.2018.08.21.07.56.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 07:56:47 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning arnout.vandecappelle@essensium.com does not designate 2a00:1450:4864:20::52c as permitted sender) client-ip=2a00:1450:4864:20::52c; Received: by mail-ed1-x52c.google.com with SMTP id e6-v6so10823590edr.2 for ; Tue, 21 Aug 2018 07:56:47 -0700 (PDT) X-Received: by 2002:a50:a5af:: with SMTP id a44-v6mr13140014edc.289.1534863406757; Tue, 21 Aug 2018 07:56:46 -0700 (PDT) Received: from vandecaa-laptop.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id e25-v6sm1990465edd.35.2018.08.21.07.56.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 07:56:46 -0700 (PDT) From: "Arnout Vandecappelle (Essensium/Mind)" To: swupdate@googlegroups.com Cc: "Arnout Vandecappelle (Essensium/Mind)" Subject: [swupdate] [PATCH 2/2] core: blacklisting should depend on CONFIG_UBIATTACH Date: Tue, 21 Aug 2018 16:56:30 +0200 Message-Id: <20180821145630.19389-2-arnout@mind.be> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180821145630.19389-1-arnout@mind.be> References: <20180821145630.19389-1-arnout@mind.be> X-Original-Sender: arnout@mind.be X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@mind-be.20150623.gappssmtp.com header.s=20150623 header.b=NhoVNIJe; spf=softfail (google.com: domain of transitioning arnout.vandecappelle@essensium.com does not designate 2a00:1450:4864:20::52c as permitted sender) smtp.mailfrom=arnout.vandecappelle@essensium.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , The blacklisting options should depend on CONFIG_UBIATTACH instead of CONFIG_MTD. Indeed, blacklisting is only relevant for attaching a UBI device. Thus, convert the CONFIG_MTD ifdefs into CONFIG_UBIATTACH in the relevant locations. In addition, there were two places where the ifdef was missing: - in the parsing of swupdate.cfg; - in the definition of struct swupdate_global_cfg. So add the ifdef there. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Stefano Babic --- If patch 1/2 is not applied, this patch is still relevant but then with UBIVOL instead of UBIATTACH. I'll respin as needed. --- core/swupdate.c | 10 ++++++---- doc/source/swupdate.rst | 2 +- include/swupdate.h | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/swupdate.c b/core/swupdate.c index bc46e7a..f66f59c 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -85,7 +85,7 @@ static struct option long_options[] = { #ifdef CONFIG_ENCRYPTED_IMAGES {"key-aes", required_argument, NULL, 'K'}, #endif -#ifdef CONFIG_MTD +#ifdef CONFIG_UBIATTACH {"blacklist", required_argument, NULL, 'b'}, #endif {"help", no_argument, NULL, 'h'}, @@ -115,7 +115,7 @@ static void usage(char *programname) programname); fprintf(stdout, " -f, --file : configuration file to use\n" -#ifdef CONFIG_MTD +#ifdef CONFIG_UBIATTACH " -b, --blacklist : MTDs that must not be scanned for UBI\n" #endif " -p, --postupdate : execute post-update command\n" @@ -469,8 +469,10 @@ static int read_globals_settings(void *elem, void *data) "public-key-file", sw->globals.publickeyfname); GET_FIELD_STRING(LIBCFG_PARSER, elem, "aes-key-file", sw->globals.aeskeyfname); +#ifdef CONFIG_UBIATTACH GET_FIELD_STRING(LIBCFG_PARSER, elem, "mtd-blacklist", sw->globals.mtdblacklist); +#endif GET_FIELD_STRING(LIBCFG_PARSER, elem, "postupdatecmd", sw->globals.postupdatecmd); get_field(LIBCFG_PARSER, elem, "verbose", &sw->globals.verbose); @@ -667,7 +669,7 @@ int main(int argc, char **argv) case 'v': loglevel = TRACELEVEL; break; -#ifdef CONFIG_MTD +#ifdef CONFIG_UBIATTACH case 'b': mtd_set_ubiblacklist(optarg); break; @@ -863,7 +865,7 @@ int main(int argc, char **argv) } } -#ifdef CONFIG_MTD +#ifdef CONFIG_UBIATTACH if (strlen(swcfg.globals.mtdblacklist)) mtd_set_ubiblacklist(swcfg.globals.mtdblacklist); #endif diff --git a/doc/source/swupdate.rst b/doc/source/swupdate.rst index fa59383..75fc4fb 100644 --- a/doc/source/swupdate.rst +++ b/doc/source/swupdate.rst @@ -472,7 +472,7 @@ Command line parameters +=============+==========+============================================+ | -f | string | SWUpdate config file to use | +-------------+----------+--------------------------------------------+ -| -b | string | Active only if CONFIG_MTD is set | +| -b | string | Active only if CONFIG_UBIATTACH is set | | | | It allows to blacklist MTDs when SWUpdate | | | | searches for UBI volumes. | | | | Example: U-Boot and environment in MTD0-1: | diff --git a/include/swupdate.h b/include/swupdate.h index 741d24c..83e8d3a 100644 --- a/include/swupdate.h +++ b/include/swupdate.h @@ -103,7 +103,9 @@ enum { struct swupdate_global_cfg { int verbose; +#ifdef CONFIG_UBIATTACH char mtdblacklist[SWUPDATE_GENERAL_STRING_SIZE]; +#endif int loglevel; int syslog_enabled; int dry_run;