diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0121-crypto-ccp-Fix-command-completion-detection-race.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0121-crypto-ccp-Fix-command-completion-detection-race.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0121-crypto-ccp-Fix-command-completion-detection-race.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0121-crypto-ccp-Fix-command-completion-detection-race.patch new file mode 100644 index 00000000..f4b839c7 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0121-crypto-ccp-Fix-command-completion-detection-race.patch @@ -0,0 +1,50 @@ +From b17bd890fe5b98844c4fa5d44cc461dd82206d88 Mon Sep 17 00:00:00 2001 +From: Tom Lendacky <thomas.lendacky@amd.com> +Date: Tue, 3 Jul 2018 12:11:33 -0500 +Subject: [PATCH 121/131] crypto: ccp - Fix command completion detection race + +The wait_event() function is used to detect command completion. The +interrupt handler will set the wait condition variable when the interrupt +is triggered. However, the variable used for wait_event() is initialized +after the command has been submitted, which can create a race condition +with the interrupt handler and result in the wait_event() never returning. +Move the initialization of the wait condition variable to just before +command submission. + +Fixes: 200664d5237f ("crypto: ccp: Add Secure Encrypted Virtualization (SEV) command support") +Cc: <stable@vger.kernel.org> # 4.16.x- +Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> +Reviewed-by: Brijesh Singh <brijesh.singh@amd.com> +Acked-by: Gary R Hook <gary.hook@amd.com> +Acked-by: Gary R Hook <gary.hook@amd.com> +Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com> +--- + drivers/crypto/ccp/psp-dev.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c +index ff478d8..973d683 100644 +--- a/drivers/crypto/ccp/psp-dev.c ++++ b/drivers/crypto/ccp/psp-dev.c +@@ -84,8 +84,6 @@ static irqreturn_t psp_irq_handler(int irq, void *data) + + static void sev_wait_cmd_ioc(struct psp_device *psp, unsigned int *reg) + { +- psp->sev_int_rcvd = 0; +- + wait_event(psp->sev_int_queue, psp->sev_int_rcvd); + *reg = ioread32(psp->io_regs + PSP_CMDRESP); + } +@@ -148,6 +146,8 @@ static int __sev_do_cmd_locked(int cmd, void *data, int *psp_ret) + iowrite32(phys_lsb, psp->io_regs + PSP_CMDBUFF_ADDR_LO); + iowrite32(phys_msb, psp->io_regs + PSP_CMDBUFF_ADDR_HI); + ++ psp->sev_int_rcvd = 0; ++ + reg = cmd; + reg <<= PSP_CMDRESP_CMD_SHIFT; + reg |= PSP_CMDRESP_IOC; +-- +2.7.4 + |