]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
crypto: crct10dif-vpmsum - Fix missing preempt_disable()
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 20 Apr 2017 05:35:09 +0000 (15:35 +1000)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 21 Apr 2017 12:30:51 +0000 (20:30 +0800)
In crct10dif_vpmsum() we call enable_kernel_altivec() without first
disabling preemption, which is not allowed.

It used to be sufficient just to call pagefault_disable(), because that
also disabled preemption. But the two were decoupled in commit 8222dbe21e79
("sched/preempt, mm/fault: Decouple preemption from the page fault
logic") in mid 2015.

The crct10dif-vpmsum code inherited this bug from the crc32c-vpmsum code
on which it was modelled.

So add the missing preempt_disable/enable(). We should also call
disable_kernel_fp(), although it does nothing by default, there is a
debug switch to make it active and all enables should be paired with
disables.

Fixes: b01df1c16c9a ("crypto: powerpc - Add CRC-T10DIF acceleration")
Acked-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/powerpc/crypto/crct10dif-vpmsum_glue.c

index bebfc329f746a2284f6f58a1d1a87cba33a51cb0..02ea277863d15001be3c919aa17c7f2ccd73aa1a 100644 (file)
@@ -44,10 +44,13 @@ static u16 crct10dif_vpmsum(u16 crci, unsigned char const *p, size_t len)
 
        if (len & ~VMX_ALIGN_MASK) {
                crc <<= 16;
+               preempt_disable();
                pagefault_disable();
                enable_kernel_altivec();
                crc = __crct10dif_vpmsum(crc, p, len & ~VMX_ALIGN_MASK);
+               disable_kernel_altivec();
                pagefault_enable();
+               preempt_enable();
                crc >>= 16;
        }