From patchwork Mon Sep 16 22:17:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 34545 Received: (qmail 22635 invoked by alias); 16 Sep 2019 22:21:14 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 22559 invoked by uid 89); 16 Sep 2019 22:21:14 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: esa3.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1568672473; x=1600208473; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jiGprlhsIhx1bXbMirHuitdmMRYWimckJ+EGxdtzV+o=; b=ZBjO/8/ldKg+1iGl+oXlzY0vDR17JYECPnPvF+nx2E9Bvu53tEp9LBf7 WjT3q0PW9zhEsArZEXMKtgx6m24n/x9Nh6cekiWflOFKqOOr4atB7bnJX aHbIS2aHU+e3B551zx7GOnkXOyS7AeY5NGtnZ0TagjHqB3Xf5cWs6HBsp zZ/I1Uj2JUgtG0Ye73xkxrSD1r/Ucjo+9KQfuC2TQhQL2+buHQujieo/4 mWmOtQP4Ko5SsKpEYDyahonYuCfbNCRg1UJSoW18NZInprHu9rnWaQmJz dWLWoI6C4ICz3Hw942rSCVNm81ZaYbvTw5plaBcwRl85PL37rx7yIR4B0 Q==; IronPort-SDR: V1LCrrCUAikN1Yoh+QdciQ0xgqunhR4VZvX/zk4tO9jIgZUwuAm8LUDmdwOQbdnT/t+oYJHMaG zHgIQOZ2h5m4VnRXA4Jryx4WTvp7Gxo2Tek1S1FmbzMfznNcFmdcFBc6MVdWzbP33o9QtoL2cK vKw5Nej63vFLIpLdNtBB5vbGvnKE7QiDTjpaq1IQFHyxRCO6DaVZjLaU2UGm7JTN0oZp4khgYY Ok/Ur7VB1YA5IMvBDraCId2cW5Ptg3psDc7rR505MMDtAdGO9gEj9C6vBhipNN4oytvP+EERw5 qZ8= IronPort-SDR: j7nzqtu0t2IKXpzjzUIr1iL8RNy5sCv9vg/6WVDPRnOXHTJd/7rdslhoP9WFa7oY58fhUe7O99 BPm0cJTuNDI0Sz0kaPt9jPb2msLRL44OL2vaPLuEwT99mISx1i40ySoS21AZBr86kuIYGAb9lo uC+fDDV1HHJSxIugt4iaKky8RTvbxTDmPtR1b040/21JC/jPsb9v2Y8yGvffrrTdWMRzWbvT/x zfdROV7KmhnCgkUF7kF0iOMQS1/CnY5cx9kKWBjhBycDAIkJdzY4WRQdmbmT4QKTRusXHtyQs3 K4GgAbox9KLw6rmBiYLtpWsS IronPort-SDR: uVF0E3EX8i11c2Mg24ogwF9eACKmBQxwhVUBHBYVT3IdwQsqviMMn269u1McooEnWEnJbGbiGC mnSufXR5NnWLOXF/rJsiDGEUzh4TaHyKeENyb4wwHIcbZj+tCSAEq3z1WB3BPBGVlD3d17YrXC fHi92uCMFdnEnZgIkEoPYC7jQxIVUcWpuF18Nd6x0BuDBkoAQDVJbGgu3yL9ehv8DGlpZS512i EnCMZCMLQbqal6t4YoVglceREdA0jApADau8ucoXGIfXnTe2qhSHGEG4OlJAa14hqq1j+MWWRR n30= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: joseph@codesourcery.com, alistair.francis@wdc.com, macro@wdc.com, alistair23@gmail.com Subject: [PATCH 2/2] sysdeps/statfs: Handle 64-bit ino_t types on 32-bit hosts Date: Mon, 16 Sep 2019 15:17:00 -0700 Message-Id: <20190916221700.22039-2-alistair.francis@wdc.com> In-Reply-To: <20190916221700.22039-1-alistair.francis@wdc.com> References: <20190916221700.22039-1-alistair.francis@wdc.com> MIME-Version: 1.0 On a 32-bit platform with a 64-bit ino_t type (__INO_T_MATCHES_INO64_T defined) we want to update the statfs struct to remove the padding as it isn't required. As we don't have the padding we also need to update the overflow checker to not access the undefined members. 2019-09-16 Alistair Francis * sysdeps/unix/sysv/linux/generic/bits/statfs.h: Handle 64-bit ino_t types on 32-bit hosts. * sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h: Likewise. --- sysdeps/unix/sysv/linux/generic/bits/statfs.h | 5 ++++- sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/generic/bits/statfs.h b/sysdeps/unix/sysv/linux/generic/bits/statfs.h index 3472084ade0..eab1439acff 100644 --- a/sysdeps/unix/sysv/linux/generic/bits/statfs.h +++ b/sysdeps/unix/sysv/linux/generic/bits/statfs.h @@ -32,7 +32,10 @@ using __USE_FILE_OFFSET64 only see the low 32 bits of some of the fields (the __fsblkcnt_t and __fsfilcnt_t fields). */ -#if defined __USE_FILE_OFFSET64 +#if defined(__USE_FILE_OFFSET64) || __INO_T_MATCHES_INO64_T == 1 +# if __INO_T_MATCHES_INO64_T == 1 && __OFF_T_MATCHES_OFF64_T != 1 +# error "ino_t and off_t must both be the same type" +# endif # define __field64(type, type64, name) type64 name #elif __WORDSIZE == 64 # define __field64(type, type64, name) type name diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h b/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h index 3c21da501b2..df35c69c09f 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h @@ -51,6 +51,9 @@ static inline int stat_overflow (struct stat *buf) /* Note that f_files and f_ffree may validly be a sign-extended -1. */ static inline int statfs_overflow (struct statfs *buf) { +#if defined (__INO_T_MATCHES_INO64_T) + return 0; +#else if (buf->__f_blocks_pad == 0 && buf->__f_bfree_pad == 0 && buf->__f_bavail_pad == 0 && (buf->__f_files_pad == 0 @@ -61,4 +64,5 @@ static inline int statfs_overflow (struct statfs *buf) __set_errno (EOVERFLOW); return -1; +#endif }