From patchwork Tue Sep 8 22:12:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360143 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=rockwellcollins.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=QLXd36ny; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmKD158Yhz9sRK for ; Wed, 9 Sep 2020 08:13:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2C36B873F5; Tue, 8 Sep 2020 22:13:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RhtaD1pk-Yqh; Tue, 8 Sep 2020 22:13:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EC798873EF; Tue, 8 Sep 2020 22:13:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3BF581BF5B4 for ; Tue, 8 Sep 2020 22:13:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 38B9286D76 for ; Tue, 8 Sep 2020 22:13:15 +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 X227DLuqYiHA for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs04.rockwellcollins.com (da1vs04.rockwellcollins.com [205.175.227.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6C6008561D for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CD2tNhCRA5Uo8EkC6uGL+yoBd1xs6HwQxT7bRvg4iM8=; b=QLXd36nyRs90vHkgjDfQqnkT0BubLD6yGTT2+I3JxnfDGoXWrtoEXUr2 c+v9T3bBkwhpMa6TYRHui7z/9TX+mELMdwCrYXl3GtaGhk46jJp1wfUpZ vaTvGOigPJmsSZ7oablpUvHFl5cZ2FA6uYnFwwXUNnXZrwMtK5S+IBO3c S8/0pGbQyF/zAhF8g73C8yrZR4ivmrjARa+CGDVjZx5UlpIhM6IRwyzfU GY6zBY/IFIvCTNxiIVB3+EVf7A/p78xATD9Yw6Bk1yb8ZsWCIq5mfPMoE 8QDrYK3X5Z7HamrnM8wSIc1KgFs87Qjfczo9/5HPkO4mDQsc4e/1sS2Cb A==; IronPort-SDR: raH8cFAGeTZoXwLQpKu6+sU9UGKqGyOjwkiykYT34nyQRdTEuWGOQdaFnvDdRoNmZ2QsFQ7RBx 2lmlHv2HQCxCjMa8umnL/78dOMhQVXQpnJZHPZbTQsEX1m/Vl8aqa7wBVH3CTbnDBFTnJSXEuu alBV8C4eJyZZ9WXM72hJIIy9QivglAlmq7cH4mh9jQ6cthyChjvmxnrOvINmwl7oS/hU11C/7W 0DVwi88V3rkCNRP9QpMvraf2m+O06tt3BwfgUuGMahFqCD2JedTl5YmK19BTGOSgNV1LrpShNk 7gw= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs04.rockwellcollins.com with ESMTP; 08 Sep 2020 17:13:14 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 5B77420051; Tue, 8 Sep 2020 17:13:13 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 17:12:55 -0500 Message-Id: <20200908221256.126984-3-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908221256.126984-1-brandon.maier@rockwellcollins.com> References: <20200908221256.126984-1-brandon.maier@rockwellcollins.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x v2 3/4] package/systemd: Backport fix for network-generator X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter@korsgaard.com, Brandon Maier , "Yann E . MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The systemd-network-generator.service will fail to parse the bootarg "ip=xxx" if it's missing the (optional) hostname field. Backport this fix from systemd v245. Signed-off-by: Brandon Maier Reviewed-by: Yann E. MORIN --- v2: - Add "backport from" and SoB ...twork-generator-allow-empty-hostname.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/systemd/0003-network-generator-allow-empty-hostname.patch diff --git a/package/systemd/0003-network-generator-allow-empty-hostname.patch b/package/systemd/0003-network-generator-allow-empty-hostname.patch new file mode 100644 index 0000000000..8d1f3aa86f --- /dev/null +++ b/package/systemd/0003-network-generator-allow-empty-hostname.patch @@ -0,0 +1,44 @@ +From 21a925a4ac7955e7d7e6cfd477e96d3a2aaee7db Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Thu, 12 Dec 2019 19:01:21 +0900 +Subject: [PATCH 1/1] network-generator: allow empty hostname + +Fixes #14319. + +[Brandon: backport from https://github.com/systemd/systemd/commit/21a925a4ac7955e7d7e6cfd477e96d3a2aaee7db] +Signed-off-by: Brandon Maier +--- + src/network/generator/network-generator.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c +index 81afa95307..bed1e42697 100644 +--- a/src/network/generator/network-generator.c ++++ b/src/network/generator/network-generator.c +@@ -574,7 +574,7 @@ static int parse_netmask_or_prefixlen(int family, const char **value, unsigned c + + static int parse_cmdline_ip_address(Context *context, int family, const char *value) { + union in_addr_union addr = {}, peer = {}, gateway = {}; +- const char *hostname, *ifname, *dhcp_type, *dns, *p; ++ const char *hostname = NULL, *ifname, *dhcp_type, *dns, *p; + unsigned char prefixlen; + int r; + +@@ -599,9 +599,11 @@ static int parse_cmdline_ip_address(Context *context, int family, const char *va + if (!p) + return -EINVAL; + +- hostname = strndupa(value, p - value); +- if (!hostname_is_valid(hostname, false)) +- return -EINVAL; ++ if (p != value) { ++ hostname = strndupa(value, p - value); ++ if (!hostname_is_valid(hostname, false)) ++ return -EINVAL; ++ } + + value = p + 1; + +-- +2.23.0 +