git: ad0b2e636d9e - main - net/netatalk3: Fix more crashes due to overly tight checks

The branch main has been updated by marcus:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ad0b2e636d9ebf0bdcfdb30933fa0658fa657b17

commit ad0b2e636d9ebf0bdcfdb30933fa0658fa657b17
Author:     Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2022-05-08 20:52:28 +0000
Commit:     Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2022-05-08 20:52:28 +0000

    net/netatalk3: Fix more crashes due to overly tight checks
    
    The check for off/len equal to 0 seems incorrect since both should be
    allowed in general.  The main validity check will ensure that all types
    are correctly handled.
    
    In addition, add more logging to it's easier to spot conditions that
    could be breaking things.
    
    PR:             263743
---
 net/netatalk3/Makefile                             |  2 +-
 .../files/patch-libatalk_adouble_ad__open.c        | 75 +++++++++++++++++++++-
 2 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index b9392a94e855..1f2ac85e3b76 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	3.1.13
-PORTREVISION=	1
+PORTREVISION=	2
 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 086594859f40..9a704469a6de 100644
--- a/net/netatalk3/files/patch-libatalk_adouble_ad__open.c
+++ b/net/netatalk3/files/patch-libatalk_adouble_ad__open.c
@@ -1,6 +1,64 @@
---- libatalk/adouble/ad_open.c.orig	2022-05-01 19:20:45 UTC
+--- libatalk/adouble/ad_open.c.orig	2022-03-22 04:44:25 UTC
 +++ libatalk/adouble/ad_open.c
-@@ -1637,6 +1637,10 @@ void *ad_entry(const struct adouble *ad, int eid)
+@@ -1574,6 +1574,8 @@ static bool ad_entry_check_size(uint32_t eid,
+     uint32_t required_len;
+ 
+ 	if (eid >= ADEID_MAX) {
++		LOG(log_error, logtype_ad, "ad_entry_check_size %d is greater than %d",
++        	    eid, ADEID_MAX);
+ 		return false;
+ 	}
+ 	if (got_len == 0) {
+@@ -1585,6 +1587,7 @@ static bool ad_entry_check_size(uint32_t eid,
+ 		 * Shouldn't happen: implicitly initialized to zero because
+ 		 * explicit initializer missing.
+ 		 */
++		LOG(log_error, logtype_ad, "ad_entry_check_size explicit initializer missing");
+ 		return false;
+ 	}
+ 	if (ad_checks[eid].expected_len == -1) {
+@@ -1594,6 +1597,8 @@ static bool ad_entry_check_size(uint32_t eid,
+ 	if (ad_checks[eid].fixed_size) {
+ 		if (ad_checks[eid].expected_len != got_len) {
+ 			/* Wrong size fo fixed size entry. */
++			LOG(log_error, logtype_ad, "ad_entry_check_size wrong size to fixed size entry (%d != %d)",
++        	    	    ad_checks[eid].expected_len, got_len);
+ 			return false;
+ 		}
+         required_len = got_len;
+@@ -1604,12 +1609,16 @@ static bool ad_entry_check_size(uint32_t eid,
+ 				 * Too small for variable sized entry with
+ 				 * minimum size.
+ 				 */
++				LOG(log_error, logtype_ad, "ad_entry_check_size too small for variable sized entry (%d < %d)",
++        	    	    	    got_len, ad_checks[eid].expected_len);
+ 				return false;
+ 			}
+         required_len = got_len;
+ 		} else {
+ 			if (got_len > ad_checks[eid].expected_len) {
+ 				/* Too big for variable sized entry. */
++				LOG(log_error, logtype_ad, "ad_entry_check_size too big for variable sized entry (%d > %d)",
++                                    got_len, ad_checks[eid].expected_len);
+ 				return false;
+ 			}
+             /*
+@@ -1621,10 +1630,14 @@ static bool ad_entry_check_size(uint32_t eid,
+ 	}
+ 	if (off + required_len < off) {
+ 		/* wrap around */
++		LOG(log_error, logtype_ad, "ad_entry_check_size wrap around (%d + %d < %d)",
++                    off, required_len, off);
+ 		return false;
+ 	}
+ 	if (off + required_len > bufsize) {
+ 		/* overflow */
++		LOG(log_error, logtype_ad, "ad_entry_check_size overflow (%d + %d > %d)",
++                    off, required_len, bufsize);
+ 		return false;
+ 	}
+ 	return true;
+@@ -1637,14 +1650,21 @@ void *ad_entry(const struct adouble *ad, int eid)
  	size_t len = ad_getentrylen(ad, eid);
  	bool valid;
  
@@ -10,4 +68,17 @@
 +
  	valid = ad_entry_check_size(eid, bufsize, off, len);
  	if (!valid) {
++		LOG(log_error, logtype_ad, "ad_entry: not valid");
+ 		return NULL;
+ 	}
+ 
+-	if (off == 0 || len == 0) {
++	/*if (off == 0 || len == 0) {
++		LOG(log_error, logtype_ad, "ad_entry: off or len is 0 (off: %d, len: %d)",
++                    off, len);
  		return NULL;
+-	}
++	}*/
+ 
+ 	return ((struct adouble *)ad)->ad_data + off;
+ }