From nobody Wed Mar 30 02:27:45 2022 X-Original-To: dev-commits-src-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 842BA1A48CF3; Wed, 30 Mar 2022 02:27:45 +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 4KSr1s3Mrzz3MKb; Wed, 30 Mar 2022 02:27:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648607265; 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=qCOuz1cbyfeolrgkpV59p4EoswB41JzlIqEPyXXz5Tg=; b=XoX9FLzKLoh2R4NzFJmbpgzm6IutBqbZ+RDDEWtBAed6yf1OV8gHAbf3MoTLDVQ/X0nfhK Skm8oF6DgSeih9gS5R+mp+zNSx3IpnZdiFqtFCMk8zXk8sjDpMuTjRz/FIRUcvNW7s+TUR W1eXOWquBI8tHP1rrc9278tXFaY31ueFMzCts1KFzHb0rZO30JZTs4F9yF2o+JMngLk9Lv y8MyoHkJ3qAZ2JpCd9H45F9pv3LYai+6LbkrnrgOUZZokdc7UF2LJQJNfqbDV2kh60tm4/ JVNQuhICa3Xe565bjYDcQkGU6v40nGAFhQeBqdzDREkby83VHQWi58Oji9qP4g== 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 4EC0123EF; Wed, 30 Mar 2022 02:27:45 +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 22U2RjkX036567; Wed, 30 Mar 2022 02:27:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22U2Rjv0036566; Wed, 30 Mar 2022 02:27:45 GMT (envelope-from git) Date: Wed, 30 Mar 2022 02:27:45 GMT Message-Id: <202203300227.22U2Rjv0036566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ccd701d27a74 - stable/13 - Clear non-x86 compat stat syscall kernel stack memory disclosure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ccd701d27a747ea7266f434170169072e8686f30 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648607265; 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=qCOuz1cbyfeolrgkpV59p4EoswB41JzlIqEPyXXz5Tg=; b=hBZP1ZkiDctu0/bMcAM9thSPGOD49NJrdiBfHsaFEuta6iJeVY6W+eQaNFx/AdQ2gRGmMR m4daZXOHFbAV+wPVLAzmxf+23PrX1pnUU1QYeyFbC0L4Fl0nvOoasi7XYd+J/a8RM/hKeM 1qWQk2GZISHipJHbELVzDFfo/xS75H05Jz1pp60/7nV82M+GG+z+8NAX8sWWK1gr+Yl6PS pWfy+aNqG9rTkPuBSyp/E5edPqg34/fTo5wPoOv7p5rp0WuqR3nllxe24JzXxqTiii8NDg Ox/Q/Ou6fwwjGhJVP4DsBL8KlZkApIMR7MiS5wX6mhIVz8U86EdxoXa6IdgxhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648607265; a=rsa-sha256; cv=none; b=PzowgKzjF3oGWfn489zTd99yr4/jnuMycDLwZZSK2266dPWtVC9ZYKCaJq5RToBr/0Qxok Sp/edMc8K4UpZgVTqZCuVcqjg9MLas39OFeqqimJG84vbxRQvaauFrpqIYRSUV+p59nJ3u YH79ambyXt4jm5mYZYHHwiLoIrh593rhLIPKitSR+jVP2Ofyb9S3IROGDn3o3Fx9xcSAcP lhSnXRQ+reTAVVCoiqFpYtT2hpuUkzdUYuHjKF44q69yGzTf6nHgtkoFVQwylPcYxXsq1z V/mNLk+uv3TVZ8vv55Ry3Fms+zm0Y3J0HclmogG+QCIBw4UAHU4q6pi3tYEItA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ccd701d27a747ea7266f434170169072e8686f30 commit ccd701d27a747ea7266f434170169072e8686f30 Author: Ed Maste AuthorDate: 2022-03-29 17:55:21 +0000 Commit: Ed Maste CommitDate: 2022-03-30 01:24:10 +0000 Clear non-x86 compat stat syscall kernel stack memory disclosure 32-bit architectures other than i386 have 64-bit time_t which results in a struct timespec with 12 bytes for tv_sec and tv_nsec, and 4 bytes of padding. Zero the padding holes in struct stat32 and struct freebsd11_stat32. i386 has 32-bit time_t; struct timespec is 8 bytes and has no padding. Found by inspection, prompted by a report by Reno Robert of Trend Micro Zero Day Initiative. The originally reported issue (ZDI-CAN-14538) is already fixed in all supported FreeBSD versions (it was addressed incidentally as part of the 64-bit inode project). Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34709 (cherry picked from commit f90cd1ae30b5f49e9f6ea58a0628ce1c8d8822bc) Approved by: re (gjb, early MFC) --- sys/compat/freebsd32/freebsd32_misc.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index e56ab423f538..4ef33774d6bb 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2135,6 +2135,17 @@ static void copy_stat(struct stat *in, struct stat32 *out) { +#ifndef __amd64__ + /* + * 32-bit architectures other than i386 have 64-bit time_t. This + * results in struct timespec32 with 12 bytes for tv_sec and tv_nsec, + * and 4 bytes of padding. Zero the padding holes in struct stat32. + */ + bzero(&out->st_atim, sizeof(out->st_atim)); + bzero(&out->st_mtim, sizeof(out->st_mtim)); + bzero(&out->st_ctim, sizeof(out->st_ctim)); + bzero(&out->st_birthtim, sizeof(out->st_birthtim)); +#endif CP(*in, *out, st_dev); CP(*in, *out, st_ino); CP(*in, *out, st_mode); @@ -2296,6 +2307,18 @@ static int freebsd11_cvtstat32(struct stat *in, struct freebsd11_stat32 *out) { +#ifndef __amd64__ + /* + * 32-bit architectures other than i386 have 64-bit time_t. This + * results in struct timespec32 with 12 bytes for tv_sec and tv_nsec, + * and 4 bytes of padding. Zero the padding holes in freebsd11_stat32. + */ + bzero(&out->st_atim, sizeof(out->st_atim)); + bzero(&out->st_mtim, sizeof(out->st_mtim)); + bzero(&out->st_ctim, sizeof(out->st_ctim)); + bzero(&out->st_birthtim, sizeof(out->st_birthtim)); +#endif + CP(*in, *out, st_ino); if (in->st_ino != out->st_ino) { switch (ino64_trunc_error) {