Re: [PATCH v4 5/5] x86/sgx: Remove redundant if conditions in sgx_encl_create

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 2/3/21 6:04 AM, Jarkko Sakkinen wrote:
On Mon, Feb 01, 2021 at 09:26:53PM +0800, Tianjia Zhang wrote:
In this scenario, there is no case where va_page is NULL, and
the error has been checked. The if condition statement here is

if-condition, i.e. dash missing


Will do in the next patch.

Thanks,
Tianjia

redundant, so remove the condition detection.

Signed-off-by: Tianjia Zhang <tianjia.zhang@xxxxxxxxxxxxxxxxx>
---
  arch/x86/kernel/cpu/sgx/ioctl.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
index 1c6ecf9fbeff..719c21cca569 100644
--- a/arch/x86/kernel/cpu/sgx/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/ioctl.c
@@ -66,9 +66,10 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)
  	va_page = sgx_encl_grow(encl);
  	if (IS_ERR(va_page))
  		return PTR_ERR(va_page);
-	else if (va_page)
-		list_add(&va_page->list, &encl->va_pages);
-	/* else the tail page of the VA page list had free slots. */
+	if (!va_page)
+		return -EIO;
+
+	list_add(&va_page->list, &encl->va_pages);
/* The extra page goes to SECS. */
  	encl_size = secs->size + PAGE_SIZE;
--
2.19.1.3.ge56e4f7



Acked-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>

/Jarkko




[Index of Archives]     [AMD Graphics]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux