Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031219AbbKEBGP (ORCPT ); Wed, 4 Nov 2015 20:06:15 -0500 Received: from mail-ig0-f172.google.com ([209.85.213.172]:33726 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030589AbbKEBGO (ORCPT ); Wed, 4 Nov 2015 20:06:14 -0500 MIME-Version: 1.0 In-Reply-To: <1446685239-28522-1-git-send-email-labbott@fedoraproject.org> References: <1446685239-28522-1-git-send-email-labbott@fedoraproject.org> Date: Wed, 4 Nov 2015 17:06:13 -0800 X-Google-Sender-Auth: eJuvUlL8kiaGFe5swQ2VpQJY05E Message-ID: Subject: Re: [PATCH] arm: Use kernel mm when updating section permissions From: Kees Cook To: Laura Abbott Cc: Russell King , Catalin Marinas , Will Deacon , "linux-arm-kernel@lists.infradead.org" , LKML , Linux-MM Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1960 Lines: 55 On Wed, Nov 4, 2015 at 5:00 PM, Laura Abbott wrote: > Currently, read only permissions are not being applied even > when CONFIG_DEBUG_RODATA is set. This is because section_update > uses current->mm for adjusting the page tables. current->mm > need not be equivalent to the kernel version. Use pgd_offset_k > to get the proper page directory for updating. > > Signed-off-by: Laura Abbott > --- > I found this while trying to convince myself of something. > Dumping the page table via debugfs and writing to kernel text were both > showing the lack of mappings. This was observed on QEMU. Maybe it's just a > QEMUism but if not it probably should go to stable. Well that's weird! debugfs showed the actual permissions that lacked RO? I wonder what changed. I tested this both with debugfs and lkdtm's KERN_WRITE test when the patches originally landed. -Kees > --- > arch/arm/mm/init.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c > index 8a63b4c..4bb936a 100644 > --- a/arch/arm/mm/init.c > +++ b/arch/arm/mm/init.c > @@ -629,11 +629,9 @@ static struct section_perm ro_perms[] = { > static inline void section_update(unsigned long addr, pmdval_t mask, > pmdval_t prot) > { > - struct mm_struct *mm; > pmd_t *pmd; > > - mm = current->active_mm; > - pmd = pmd_offset(pud_offset(pgd_offset(mm, addr), addr), addr); > + pmd = pmd_offset(pud_offset(pgd_offset_k(addr), addr), addr); > > #ifdef CONFIG_ARM_LPAE > pmd[0] = __pmd((pmd_val(pmd[0]) & mask) | prot); > -- > 2.5.0 > -- Kees Cook Chrome OS Security -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/