[PATCH 01/10] nitro_enclaves: Fixup type and simplify logic of the poll mask setup

Tim Gardner tim.gardner at canonical.com
Thu Dec 2 13:12:49 UTC 2021


From: Andra Paraschiv <andraprs at amazon.com>

BugLink: https://bugs.launchpad.net/bugs/1951873

Update the assigned value of the poll result to be EPOLLHUP instead of
POLLHUP to match the __poll_t type.

While at it, simplify the logic of setting the mask result of the poll
function.

Reported-by: kernel test robot <lkp at intel.com>
Reviewed-by: Alexander Graf <graf at amazon.com>
Signed-off-by: Andra Paraschiv <andraprs at amazon.com>
Link: https://lore.kernel.org/r/20201102173622.32169-1-andraprs@amazon.com
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
(cherry picked from commit d9109fe0f30a1fba66b8623837fc3d3c1a031090)
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 drivers/virt/nitro_enclaves/ne_misc_dev.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
index f06622b48d695..f1964ea4b8269 100644
--- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
@@ -1505,10 +1505,8 @@ static __poll_t ne_enclave_poll(struct file *file, poll_table *wait)
 
 	poll_wait(file, &ne_enclave->eventq, wait);
 
-	if (!ne_enclave->has_event)
-		return mask;
-
-	mask = POLLHUP;
+	if (ne_enclave->has_event)
+		mask |= EPOLLHUP;
 
 	return mask;
 }
-- 
2.34.1




More information about the kernel-team mailing list