From nobody Sun May 01 19:22:18 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 51B8C1AABE03; Sun, 1 May 2022 19:22:18 +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 4Krx1k1skKz3h18; Sun, 1 May 2022 19:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651432938; 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=gebGXIF3pt7nrEuHx3eogqoZ5IAibO1gPL2/oko4lAE=; b=lo1/DoluUwvDqeykA7Cf8vnaGYtvYK9YymvOSZRdMjPeqtW4OU35NSxsGyT9Y1vcyqW3p/ TiiP9PqCC4I5i6jJYpy+rS2JoXJWg2MXdU8iV3ipKlUyVfGjOYTYJ09XNiuZmZ85nh6np7 Om9j4XCuZ22UnW9cgqlbgiNbzr3Az760njTROQklUulocz0VhKHX9Pr176xXZUWK5Fyhs5 ZzkAd5tgtbQxb/eyElO7o0aINOyhaXLvZvUcMx4ROiAaSSnRxsaDjfU7Du5F8qrOkr11tK DnjSIDp/EIHSEDFKdbFXbKoxxartX0CU8K/R+5javHvkS2tz/av2JBSoDc/nVQ== 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 211F71B7C0; Sun, 1 May 2022 19:22:18 +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 241JMI6e025163; Sun, 1 May 2022 19:22:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241JMItf025162; Sun, 1 May 2022 19:22:18 GMT (envelope-from git) Date: Sun, 1 May 2022 19:22:18 GMT Message-Id: <202205011922.241JMItf025162@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: 50daf3d28888 - main - net/netatalk3: Fix SIGSEGV on login 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: 50daf3d28888226dc32e493b53ffc588a65cca5e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651432938; 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=gebGXIF3pt7nrEuHx3eogqoZ5IAibO1gPL2/oko4lAE=; b=W9GhpjgI8t/u4+io9Weh4xpb4pFTahELG7zVw1+t5v9Gjwm0S2zCEggcXjL4xsfG4rEL/D NKh12is0vuI4seXTuZap4Vgs19YopjAyNU4cUG5kJM6DF/nj/CCkMeMCb2vlgmpowYiI+8 4gJ82r3RbjKt1OR0HxYDyNSABknZkcdff11lK3yxJRVMlUUwGQTsy8V9S6H2QQ4OfRe2Hu 04kU+rO5Vovb0qGvJ/vku1/Z1ldM7QhiAIU8EsKJ0UTZjEK4yYeICJ0Ba2W2x15EbWUxos BcJM29vUnAOZyKKRtJ2Mz6aXKlcq1IUHhr6Q8trJqz9I5uU2pi+Ph6I14YVorQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651432938; a=rsa-sha256; cv=none; b=wf2P+Rd6gzpBc1aRgL4b8fMPEp+SrkrAgDWUbBBomBmCKpAB5LM5uPbG3i82v4HZo4Bf18 xtS67FRqtcfhwAPQxaU0RFHGiR4vlgtL82CRJkWBIPwRkI2L/pA4sq5hvH9k7gRDNdqPd6 XOZjf+YwjVMHadbDst38gV0rgehFBXch1LIl5vij0mvGVpNQSuwTqWlvRRuMxWgQ8uArGO tpnhvZwPFPk0Hzaz/sN6+ifN9E5qXYMdsbILHIQbfy48k78I+9i7+mK4/1xT7xcvmlAdol xrNP78joP8zY+VS9ePkIfMH4UiQ3cRMp1Yzg7unFWW8qp467DZB4WhUODXFMfA== 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=50daf3d28888226dc32e493b53ffc588a65cca5e commit 50daf3d28888226dc32e493b53ffc588a65cca5e Author: Joe Marcus Clarke AuthorDate: 2022-05-01 19:21:17 +0000 Commit: Joe Marcus Clarke CommitDate: 2022-05-01 19:22:16 +0000 net/netatalk3: Fix SIGSEGV on login If the adouble bufsize is 0 (no valid header exists yet), initialize it to the adouble length less the offset and eid length. --- net/netatalk3/Makefile | 1 + net/netatalk3/files/patch-libatalk_adouble_ad__open.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index d8e500a7a6b2..b9392a94e855 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -2,6 +2,7 @@ PORTNAME= netatalk PORTVERSION= 3.1.13 +PORTREVISION= 1 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 new file mode 100644 index 000000000000..086594859f40 --- /dev/null +++ b/net/netatalk3/files/patch-libatalk_adouble_ad__open.c @@ -0,0 +1,13 @@ +--- libatalk/adouble/ad_open.c.orig 2022-05-01 19:20:45 UTC ++++ libatalk/adouble/ad_open.c +@@ -1637,6 +1637,10 @@ void *ad_entry(const struct adouble *ad, int eid) + size_t len = ad_getentrylen(ad, eid); + bool valid; + ++ if (bufsize == 0) { ++ bufsize = sizeof(ad->ad_data) - (off + len); ++ } ++ + valid = ad_entry_check_size(eid, bufsize, off, len); + if (!valid) { + return NULL;