From: deraadt <deraadt@openbsd.org>
Date: Mon, 14 Jun 2021 00:36:13 +0000 (+0000)
Subject: 32-bit systems incorrectly parse the (64-bit) length of ustar extended
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8e4f2f54ea6f65952935dc3254d2161f9dae1bd6;p=openbsd

32-bit systems incorrectly parse the (64-bit) length of ustar extended
headers (hd->size) using a 32-bit operation.
from Samanta Navarro
ok guenther
---

diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index eb93d28737c..9d8a92d9d13 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tar.c,v 1.68 2019/06/24 03:33:09 deraadt Exp $	*/
+/*	$OpenBSD: tar.c,v 1.69 2021/06/14 00:36:13 deraadt Exp $	*/
 /*	$NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $	*/
 
 /*-
@@ -732,7 +732,7 @@ reset:
 	/* Process Extended headers. */
 	if (hd->typeflag == XHDRTYPE || hd->typeflag == GHDRTYPE) {
 		if (rd_xheader(arcn, hd->typeflag == GHDRTYPE,
-		    (off_t)asc_ul(hd->size, sizeof(hd->size), OCT)) < 0)
+		    (off_t)asc_ull(hd->size, sizeof(hd->size), OCT)) < 0)
 			return (-1);
 
 		/* Update and check the ustar header. */