Date: Tue, 8 Aug 2017 11:27:19 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r322246 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201708081127.v78BRJtu047658@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Tue Aug 8 11:27:19 2017 New Revision: 322246 URL: https://svnweb.freebsd.org/changeset/base/322246 Log: 8508 Mounting a zpool on 32-bit platforms panics illumos/illumos-gate@b11fe8c01471a5bff68e83e1fe5f809ad16b3be8 https://github.com/illumos/illumos-gate/commit/b11fe8c01471a5bff68e83e1fe5f809ad16b3be8 https://www.illumos.org/issues/8508 Mounting a zpool on a 32-bit system triggers a panic in spa_history_log_version () due to a type format mismatch for ZPL_VERSION. ZPL_VERSION is a unsigned long long, but the format expects an integer. On 64-bit platforms this may not be an issue due to word size and alignment. On 32-bit platforms a word size is half that of a long long, causing the second word of the long long to be seen as the string pointer for utsname.nodename. Reviewed by: Matt Ahrens <mahrens@delphix.com> Approved by: Dan McDonald <danmcd@joyent.com> Author: Justin Hibbits <chmeeedalf@gmail.com> Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa_history.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa_history.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/spa_history.c Tue Aug 8 11:26:03 2017 (r322245) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa_history.c Tue Aug 8 11:27:19 2017 (r322246) @@ -614,7 +614,7 @@ void spa_history_log_version(spa_t *spa, const char *operation) { spa_history_log_internal(spa, operation, NULL, - "pool version %llu; software version %llu/%d; uts %s %s %s %s", + "pool version %llu; software version %llu/%llu; uts %s %s %s %s", (u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION, utsname.nodename, utsname.release, utsname.version, utsname.machine);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708081127.v78BRJtu047658>