From: tip-bot for Peng Hao <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: peng.hao2@zte.com.cn, thomas.lendacky@amd.com,
tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com,
linux-kernel@vger.kernel.org, kirill.shutemov@linux.intel.com
Subject: [tip:x86/urgent] x86/mm/mem_encrypt: Fix erroneous sizeof()
Date: Tue, 15 Jan 2019 02:45:54 -0800 [thread overview]
Message-ID: <tip-bf7d28c53453ea904584960de55e33e03b9d93b1@git.kernel.org> (raw)
In-Reply-To: <1546065252-97996-1-git-send-email-peng.hao2@zte.com.cn>
Commit-ID: bf7d28c53453ea904584960de55e33e03b9d93b1
Gitweb: https://git.kernel.org/tip/bf7d28c53453ea904584960de55e33e03b9d93b1
Author: Peng Hao <peng.hao2@zte.com.cn>
AuthorDate: Sat, 29 Dec 2018 14:34:12 +0800
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 15 Jan 2019 11:41:58 +0100
x86/mm/mem_encrypt: Fix erroneous sizeof()
Using sizeof(pointer) for determining the size of a memset() only works
when the size of the pointer and the size of type to which it points are
the same. For pte_t this is only true for 64bit and 32bit-NONPAE. On 32bit
PAE systems this is wrong as the pointer size is 4 byte but the PTE entry
is 8 bytes. It's actually not a real world issue as this code depends on
64bit, but it's wrong nevertheless.
Use sizeof(*p) for correctness sake.
Fixes: aad983913d77 ("x86/mm/encrypt: Simplify sme_populate_pgd() and sme_populate_pgd_large()")
Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: dave.hansen@linux.intel.com
Cc: peterz@infradead.org
Cc: luto@kernel.org
Link: https://lkml.kernel.org/r/1546065252-97996-1-git-send-email-peng.hao2@zte.com.cn
---
arch/x86/mm/mem_encrypt_identity.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/mem_encrypt_identity.c b/arch/x86/mm/mem_encrypt_identity.c
index a19ef1a416ff..4aa9b1480866 100644
--- a/arch/x86/mm/mem_encrypt_identity.c
+++ b/arch/x86/mm/mem_encrypt_identity.c
@@ -158,8 +158,8 @@ static void __init sme_populate_pgd(struct sme_populate_pgd_data *ppd)
pmd = pmd_offset(pud, ppd->vaddr);
if (pmd_none(*pmd)) {
pte = ppd->pgtable_area;
- memset(pte, 0, sizeof(pte) * PTRS_PER_PTE);
- ppd->pgtable_area += sizeof(pte) * PTRS_PER_PTE;
+ memset(pte, 0, sizeof(*pte) * PTRS_PER_PTE);
+ ppd->pgtable_area += sizeof(*pte) * PTRS_PER_PTE;
set_pmd(pmd, __pmd(PMD_FLAGS | __pa(pte)));
}
prev parent reply other threads:[~2019-01-15 10:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-29 6:34 [PATCH] x86/mm/mem_encrypt_identity : fix error useage to sizeof Peng Hao
2018-12-29 8:00 ` Borislav Petkov
2019-01-15 10:45 ` tip-bot for Peng Hao [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-bf7d28c53453ea904584960de55e33e03b9d93b1@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peng.hao2@zte.com.cn \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).