From nobody Thu Oct 13 17:14:00 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 4MpGMX3KGMz4fC1T; Thu, 13 Oct 2022 17:14:00 +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 4MpGMX2q3Vz3bt0; Thu, 13 Oct 2022 17:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665681240; 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=qT0Yjr1J+bosXwCbCHd4xbQ//VCXMy/eDfaAMbi3drM=; b=W/U06DgO28PSfp75XNHBqmhwTnA1Yf7SdV7badTn+peNdj97HQqO0IQtN0rVCaGglzf8En U4F3nojJkATOyzrYm7busDWZ2SW7a7ldPuBWtaPfKuOEMC1hVCNFsl5Yk+ZxA+yIi6NUTZ 14QuGQQRGrY+WiNnI3nps+kBu8lAMPiUdquvqc4AXMQ0IiUhAOx5BaTd87lJv29K6E87r8 Vct+Vir64mPaQN0T0X51RRqXuNo9i64G8HYrQJ1xPIFVemm1H7v2BFKTaLSECdx6qVy7+H VtWy6B8qHgr9SOaqfyeWEjDdpYXW0WghQJiSAjF/uSRXfdAK9h8EC9JtKJTnXA== 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 4MpGMX1sbSzVFX; Thu, 13 Oct 2022 17:14:00 +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 29DHE0eQ034082; Thu, 13 Oct 2022 17:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29DHE05A034081; Thu, 13 Oct 2022 17:14:00 GMT (envelope-from git) Date: Thu, 13 Oct 2022 17:14:00 GMT Message-Id: <202210131714.29DHE05A034081@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: db2b8e7e56e0 - main - net/netatalk3: Fix metadata deletion warnings 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: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db2b8e7e56e03df0101eadbb86360c282e9494fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665681240; 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=qT0Yjr1J+bosXwCbCHd4xbQ//VCXMy/eDfaAMbi3drM=; b=x6q+khOPgg/niSJyK6xoICUKQNddds0XgveOBVPt9DtqMH159YCodknJy8TXm2KazCcGvu UlYUaTOdbyW5v+SgPc1W6/KLDHkgPGSc5kwPkJWW4mljHAGRoS67DpAOGNm8ruRSoXJCwX UjuaHTwFDXBPH2W6LDUyATEIGvVFoeJuMLTbEvEJkrAjYYpwnU53PkPfne329/Mf6L710S 6EzzIEYD7bbOPfi8KvwEWXBrwRvnC99aMBlM/1DU2x8CwVskHOywdNGbi4gU0Uh5yB221A LBn8Fe6OCuAW5IGTZ3oSUSS+wn2kpLrnLGw1Dyy8aPT7573naddFGJDmJhQT+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665681240; a=rsa-sha256; cv=none; b=McsoJCv41yHrTztZKztOwrV9SbiGnoDwAKj8ujTEEV2e5gvBsMQsXVIRKfA+gM57g3q3v/ 3D9e27iE60oBr54rjhjraVegjnN4D2CmNQyTB8qjRpByB/eiHE/7NsgNowrw+zW7NlTJO1 FgAWi1LbE6PAIa5J0GLx8cdv/MDHnsH+tn8JWq2dDgil3JYEs99wzx1CgvY7sibVvV3H/Y FXNlU7Vw764X0CkkUXv04RzbnVRorYQka69eCQPIA2LZMJA1G1/mfkr6SiUyQ0eIQqHPBN iwNYEMWsD/Dzy1DygtN/l2XGbjRRrZSNKVubuEnLily/znV105AetgVNCldDVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=db2b8e7e56e03df0101eadbb86360c282e9494fd commit db2b8e7e56e03df0101eadbb86360c282e9494fd Author: Joe Marcus Clarke AuthorDate: 2022-10-13 17:12:35 +0000 Commit: Joe Marcus Clarke CommitDate: 2022-10-13 17:12:35 +0000 net/netatalk3: Fix metadata deletion warnings These hunks should have been committed in the _3 update but were left out likely in some makepatch shuffling. PR: 267024 Obtained from: Upstream netatalk GitHub --- net/netatalk3/Makefile | 2 +- .../files/patch-libatalk_adouble_ad__open.c | 62 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 71d081b6c62c..659a299aa0c1 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,6 +1,6 @@ PORTNAME= netatalk PORTVERSION= 3.1.13 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF diff --git a/net/netatalk3/files/patch-libatalk_adouble_ad__open.c b/net/netatalk3/files/patch-libatalk_adouble_ad__open.c index a5a279834158..bff592c563bd 100644 --- a/net/netatalk3/files/patch-libatalk_adouble_ad__open.c +++ b/net/netatalk3/files/patch-libatalk_adouble_ad__open.c @@ -95,3 +95,65 @@ || ((eid != ADEID_RFORK) && (off + len > valid_data_len))) { LOG(log_warning, logtype_ad, "parse_entries: bogus eid: %u, off: %u, len: %u", +@@ -782,20 +791,42 @@ static int ad_header_read_ea(const char *path, struct + EC_FAIL; + } + ++ /* ++ * It is possible for AFP metadata to contain a zero-length ++ * comment. This will cause ad_entry(ad, ADEID_COMMENT) to return NULL ++ * but should not be treated as an error condition. ++ * Since recent CVE fixes have introduced new behavior regarding ++ * ad_entry() output. For now, we will AFP_ASSERT() in EC_CLEANUP to prevent ++ * altering on-disk info. This does introduce an avenue to DOS ++ * the netatalk server by locally writing garbage to the EA. At this ++ * point, the outcome is an acceptable risk to prevent unintended ++ * changes to metadata. ++ */ + if (nentries != ADEID_NUM_EA + || !ad_entry(ad, ADEID_FINDERI) +- || !ad_entry(ad, ADEID_COMMENT) + || !ad_entry(ad, ADEID_FILEDATESI) + || !ad_entry(ad, ADEID_AFPFILEI) + || !ad_entry(ad, ADEID_PRIVDEV) + || !ad_entry(ad, ADEID_PRIVINO) + || !ad_entry(ad, ADEID_PRIVSYN) + || !ad_entry(ad, ADEID_PRIVID)) { +- LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): invalid metadata EA", fullpathname(path)); ++ LOG(log_error, logtype_ad, ++ "ad_header_read_ea(\"%s\"): invalid metadata EA " ++ "this is now being treated as a fatal error. " ++ "if you see this log entry, please file a bug ticket " ++ "with your upstream vendor and attach the generated " ++ "core file.", path ? fullpathname(path) : "UNKNOWN"); ++ + errno = EINVAL; + EC_FAIL; + } + ++ if (!ad_entry(ad, ADEID_COMMENT) && ++ (ad->ad_eid[ADEID_COMMENT].ade_len != 0)) { ++ errno = EINVAL; ++ EC_FAIL; ++ } ++ + /* + * Ensure the resource fork offset is always set + */ +@@ -805,6 +836,8 @@ static int ad_header_read_ea(const char *path, struct + #endif + + EC_CLEANUP: ++ AFP_ASSERT(!(ret != 0 && errno == EINVAL)); ++#if 0 + if (ret != 0 && errno == EINVAL) { + become_root(); + (void)sys_removexattr(path, AD_EA_META); +@@ -812,6 +845,7 @@ EC_CLEANUP: + LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): deleted invalid metadata EA", fullpathname(path), nentries); + errno = ENOENT; + } ++#endif + EC_EXIT; + } +