From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELspaNojiIZHhTW09pNu2rqlfA1//rzkYf9npZYUZTqUxu/zK553d5gOeE6xp2radgMReymg ARC-Seal: i=1; a=rsa-sha256; t=1519981121; cv=none; d=google.com; s=arc-20160816; b=wa71C7lCVAzLYE40gaFeFLFMzXzJMEkp5kbv21gAQ6/h/pYR7w3A3dlnBS0Y/erPHc qrQasjMHlgIMrO3i4PHh5A4oTtLQ2aTZck137qESLLYWxoXLDJlSYdfKmMxJg3/pK2t7 AkFDWppIrzVSbkhgkak6CSxgZ4xGaxoEFzaLsRM71Auoah997pKgglMnxCUAu/CRHkWj mXj4BJkcwjClIuKreL0QElphqXFA3ydohR9+ZY5k7DV5np8TzzSDZQKD9iLkJ5onZTHQ hCE6HUv5209Pcm+K8CoGs2jglc1bVIOdSp7sVJJJJctBB72I3HbuZKhHIHwG3LwOm0CQ 5SVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=7S1ujfkJpyNTvTFyYcYX66/rpzMQmbzIMjzifGS6B8Y=; b=Mkw+rLLF2GjAxvWV/yJj6KLdN1GO/ikusIE5vOrICw1HB0dvo8cveh+TQHMG0s5qSq X58SG/evOT8TD9APrvmeu2AeMVPKLtUwmiHCCG6T74RYfzioj8btaQoodw2smUU1nP+p EWAugDzlMRCmeSMK8WwvI+zIKq+VN9lLGSIedPtJKCDyaDolnO/3qFbDy10LKX748nKU yaMExMhAD0V9KVc+nU7q82a8fmzcW9WaDQb090XD4TPiHX8hG0oQ4ga5QSECgqesAeHC jPwt1YjI8+7FUMtYKOlHME84/CAqRphv4z/a6cwr3dQKiMRr8oeKK3cK7z5bBw9UH9i9 hzlA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 83.175.124.243 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 83.175.124.243 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lvqiang Huang , Chunyan Zhang , Russell King , Sasha Levin Subject: [PATCH 4.9 10/56] ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch Date: Fri, 2 Mar 2018 09:50:56 +0100 Message-Id: <20180302084450.150750423@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180302084449.568562222@linuxfoundation.org> References: <20180302084449.568562222@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1593815515532586116?= X-GMAIL-MSGID: =?utf-8?q?1593815724658561459?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chunyan Zhang [ Upstream commit 36b0cb84ee858f02c256d26f0cb4229c78e3399e ] An additional 'ip' will be pushed to the stack, for restoring the DACR later, if CONFIG_CPU_SW_DOMAIN_PAN defined. However, the fixup still get the err_ptr by add #8*4 to sp, which results in the fact that the code area pointed by the LR will be overwritten, or the kernel will crash if CONFIG_DEBUG_RODATA is enabled. This patch fixes the stack mismatch. Fixes: a5e090acbf54 ("ARM: software-based priviledged-no-access support") Signed-off-by: Lvqiang Huang Signed-off-by: Chunyan Zhang Signed-off-by: Russell King Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/arm/lib/csumpartialcopyuser.S | 4 ++++ 1 file changed, 4 insertions(+) --- a/arch/arm/lib/csumpartialcopyuser.S +++ b/arch/arm/lib/csumpartialcopyuser.S @@ -85,7 +85,11 @@ .pushsection .text.fixup,"ax" .align 4 9001: mov r4, #-EFAULT +#ifdef CONFIG_CPU_SW_DOMAIN_PAN + ldr r5, [sp, #9*4] @ *err_ptr +#else ldr r5, [sp, #8*4] @ *err_ptr +#endif str r4, [r5] ldmia sp, {r1, r2} @ retrieve dst, len add r2, r2, r1