From patchwork Thu Apr 16 17:59:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel M. Weeks" X-Patchwork-Id: 1271841 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4936Vx4q44z9sWV for ; Fri, 17 Apr 2020 04:02:01 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=rpi.edu Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4936Vx2MpszDsM9 for ; Fri, 17 Apr 2020 04:02:01 +1000 (AEST) X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=rpi.edu (client-ip=128.113.2.229; helo=smtp9.server.rpi.edu; envelope-from=weeksd2@rpi.edu; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=rpi.edu Received: from smtp9.server.rpi.edu (smtp9.server.rpi.edu [128.113.2.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4936Rk1Yc5zDrgC for ; Fri, 17 Apr 2020 03:59:13 +1000 (AEST) Received: from smtp-auth3.server.rpi.edu (route.canit.rpi.edu [128.113.2.233]) by smtp9.server.rpi.edu (8.14.4/8.14.4/Debian-8+deb8u2) with ESMTP id 03GHxAde116579 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 16 Apr 2020 13:59:10 -0400 Received: from smtp-auth3.server.rpi.edu (localhost [127.0.0.1]) by smtp-auth3.server.rpi.edu (Postfix) with ESMTP id 24580580CD for ; Thu, 16 Apr 2020 13:59:10 -0400 (EDT) Received: from dev.danweeks.net (cpe-74-70-107-6.nycap.res.rr.com [74.70.107.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: weeksd2) by smtp-auth3.server.rpi.edu (Postfix) with ESMTPSA id 03DDB580CA for ; Thu, 16 Apr 2020 13:59:09 -0400 (EDT) Date: Thu, 16 Apr 2020 13:59:08 -0400 From: "Daniel M. Weeks" To: petitboot@lists.ozlabs.org Subject: [PATCH 04/11] Expand hwaddr buffers Message-ID: <3a568a0093fbd5831780bec3bddf370cfc416e10.1587059235.git.weeksd2@rpi.edu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Virus-Scanned: ClamAV using ClamSMTP X-Bayes-Prob: 0.0001 (Score 0, tokens from: outgoing, @@RPTN) X-Spam-Score: 0.00 () [Hold at 10.10] X-CanIt-Incident-Id: 022rtXafu X-CanIt-Geo: ip=74.70.107.6; country=US; region=New York; city=Troy; latitude=42.7273; longitude=-73.6696; http://maps.google.com/maps?q=42.7273,-73.6696&z=6 X-CanItPRO-Stream: outgoing X-Canit-Stats-ID: Bayes signature not available X-Scanned-By: CanIt (www . roaringpenguin . com) on 128.113.2.229 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" This expands the hwaddr buffers to 8 bytes - large enough to store an Infiniband GUID. Signed-off-by: Daniel M. Weeks --- discover/network.c | 4 ++-- lib/types/types.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/discover/network.c b/discover/network.c index 68400a5..6887fc5 100644 --- a/discover/network.c +++ b/discover/network.c @@ -25,7 +25,7 @@ #include "device-handler.h" #include "paths.h" -#define MAC_HWADDR_SIZE 6 +#define MAX_HWADDR_SIZE 8 #define PIDFILE_BASE (LOCAL_STATE_DIR "/petitboot/") #define INITIAL_BUFSIZE 4096 @@ -42,7 +42,7 @@ struct interface { int ifindex; char name[IFNAMSIZ]; - uint8_t hwaddr[MAC_HWADDR_SIZE]; + uint8_t hwaddr[MAX_HWADDR_SIZE]; unsigned int hwaddr_len; enum { diff --git a/lib/types/types.h b/lib/types/types.h index 674a748..ab46a69 100644 --- a/lib/types/types.h +++ b/lib/types/types.h @@ -138,9 +138,11 @@ struct system_info { #define MAC_HWADDR_SIZE 6 +#define MAX_HWADDR_SIZE 8 + struct interface_config { unsigned int hwaddr_len; - uint8_t hwaddr[MAC_HWADDR_SIZE]; + uint8_t hwaddr[MAX_HWADDR_SIZE]; bool ignore; enum { CONFIG_METHOD_DHCP,