From nobody Fri Sep 16 13:04:54 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MTZ6b22FFz4cmVp; Fri, 16 Sep 2022 13:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MTZ6b1Wdmz4QDn; Fri, 16 Sep 2022 13:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663333495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zyRmwSSINttYhXznkk/IFm0HBomL7oGpuoBRM8zME0=; b=OiVLGAbvi1lyqRm9NTddUiZqPX6ZQ6wKVLer0KmNkqL4NUXgAiWh6WM4006fIL2Nh4wi7N uQ+aabkTjrvGdbYx9NsPF3LxghRwrIpEP16026VSFiaYdiAmet7+MNMTeTxoCEM441gsEj lF9NftEf7EPEUYq1obW10O7bbaIvFKWu5vvKOgXrePicaNxM39SbhIrs8GkV8dnhDKkILp ALHlY1QrnHJpGLL/r26WxTEJwt+8l063ggN5jRqoPSIHCcEjC1BRecXbbti8oAKmgrOGYs iz+Zlb4RGxDfZdQJzV+W+gXeJVrfsTseoBFywA4P9aE4ra3FD/+1pYYtLjEAGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MTZ6b0RpfzMWH; Fri, 16 Sep 2022 13:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28GD4sKo076333; Fri, 16 Sep 2022 13:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28GD4skJ076332; Fri, 16 Sep 2022 13:04:54 GMT (envelope-from git) Date: Fri, 16 Sep 2022 13:04:54 GMT Message-Id: <202209161304.28GD4skJ076332@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 718e4558933b - main - sysutils/dmidecode: Fix segmentation fault in dmi_hp_240_attr() List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 718e4558933b64d71a2491a20fea337a8ec76d9b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663333495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zyRmwSSINttYhXznkk/IFm0HBomL7oGpuoBRM8zME0=; b=t+D49Jupn6hU/3qRmW403JoA8s+SilWXpc8ahwARQ7XGqsQlwCvB9iqG3qZhQJdeZyipsf KZgxR2XkfEyAaVQRIMNgoCssMEr7svHS6jUGZAxEH9U2QBL3Dp63X4ufjIQyarZtUeMdN/ JI8Hdy0IQ9amqMgV7678+ljLqO2zMgwsi4mDpVKnaguk6d/UpO6yMmcU6KhoCGSSf/z60E ZtYYpvg13U2STaAen/O5INzFxVXcUkC0zPha9Xh3x5pjweLHBQCD+QN7zIgRivwNJwR/mO EU4Am+ocCT34qmVEsLCnkgjKF5IfD+u/IENseZrMQoH0idapi2fLMgdGNlOD7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663333495; a=rsa-sha256; cv=none; b=gYQQl2364gPGAyCPKQ9T264BjbrBUoM7GliI6xttj5zoFcBjqOsr83JrWL5sNsZphbKJzC NUvVPQoyx9Xv1mWPJOFVnAENw+Y+sSefJ2UHmt/EWDyyOwy5nwRqnM6to13IfD2x9fPPa3 62zv1B6hB7YQJ5tlXqgVJGRqtLJymoLu/W/KCU/q1zBMT1Z1Uvdk0Ry1JzniUR/wgVegkh Inz7FhUqhplLMARGmkRgV7bMkW0jOQmpsCJlNJ4YWyHWr9vrl86y6xdpJu3u0LWMsivROW wfsRe3ygGM/CTasumMW/B2B2Yt/Ws72iel8FJK2Ax0yxm73i18fybxofaA1vEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=718e4558933b64d71a2491a20fea337a8ec76d9b commit 718e4558933b64d71a2491a20fea337a8ec76d9b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-09-16 12:51:28 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-09-16 12:51:28 +0000 sysutils/dmidecode: Fix segmentation fault in dmi_hp_240_attr() Back port a patch from the dmidecode upsteam that resolves a crash when reading the Attribute #240 on some HP hardware. See https://git.savannah.nongnu.org/cgit/dmidecode.git/commit/?id=c3357b532941a8df387618e692e522cc7a43b3e8 Approved by: portmgr blanket Sponsored by: Klara Inc. --- sysutils/dmidecode/Makefile | 2 +- sysutils/dmidecode/files/patch-dmioem.c | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile index d3c39e4e3381..b8e0575986e4 100644 --- a/sysutils/dmidecode/Makefile +++ b/sysutils/dmidecode/Makefile @@ -1,6 +1,6 @@ PORTNAME= dmidecode PORTVERSION= 3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SAVANNAH diff --git a/sysutils/dmidecode/files/patch-dmioem.c b/sysutils/dmidecode/files/patch-dmioem.c index 21d4ec2e5b5c..4726367ec947 100644 --- a/sysutils/dmidecode/files/patch-dmioem.c +++ b/sysutils/dmidecode/files/patch-dmioem.c @@ -2,7 +2,24 @@ Obtained from: https://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=a1a225 --- dmioem.c.orig 2022-06-27 15:06:32 UTC +++ dmioem.c -@@ -299,6 +299,96 @@ static void dmi_hp_203_devloc(const char *fname, unsig +@@ -198,13 +198,14 @@ static void dmi_hp_240_attr(u64 defined, u64 set) + }; + unsigned int i; + +- pr_attr("Attributes Defined/Set", NULL); ++ pr_list_start("Attributes Defined/Set", NULL); + for (i = 0; i < ARRAY_SIZE(attributes); i++) + { + if (!(defined.l & (1UL << i))) + continue; +- pr_subattr(attributes[i], "%s", set.l & (1UL << i) ? "Yes" : "No"); ++ pr_list_item("%s: %s", attributes[i], set.l & (1UL << i) ? "Yes" : "No"); + } ++ pr_list_end(); + } + + static void dmi_hp_203_assoc_hndl(const char *fname, u16 num) +@@ -299,6 +300,96 @@ static void dmi_hp_203_devloc(const char *fname, unsig pr_attr(fname, "%s", str); } @@ -99,7 +116,7 @@ Obtained from: https://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=a1a225 static void dmi_hp_238_loc(const char *fname, unsigned int code) { const char *str = "Reserved"; -@@ -597,6 +687,36 @@ static int dmi_decode_hp(const struct dmi_header *h) +@@ -597,6 +688,36 @@ static int dmi_decode_hp(const struct dmi_header *h) pr_attr("Misc. Features", "0x%08x", feat); pr_subattr("iCRU", "%s", feat & 0x0001 ? "Yes" : "No"); pr_subattr("UEFI", "%s", feat & 0x1400 ? "Yes" : "No");