This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new f926b188cfe fs/vfs: validate parameters and buffer alignment in eventfd
f926b188cfe is described below

commit f926b188cfe2f0e8d04ba130a26035f75f50760c
Author: Swatantra Yadav <[email protected]>
AuthorDate: Fri Nov 13 22:14:56 2026 +0530

    fs/vfs: validate parameters and buffer alignment in eventfd
    
    1. eventfd_do_read():
       - Separate buffer nullity and size validation: return -EFAULT when
         buffer == NULL per POSIX read(2), and -EINVAL when
         len < sizeof(eventfd_t) per Linux eventfd(2) specification.
       - Eliminate unaligned memory access: replace direct pointer casting
         and 64-bit store on (FAR eventfd_t *)buffer with a local variable
         and memcpy(), preventing alignment traps on strict architectures.
    
    2. eventfd_do_write():
       - Separate buffer nullity and size validation: return -EFAULT when
         buffer == NULL per POSIX write(2), and -EINVAL when
         len < sizeof(eventfd_t) per Linux eventfd(2) specification.
       - Read input counter once into a local variable via memcpy() to
         prevent unaligned 64-bit loads and eliminate repeated buffer
         dereferencing.
       - Bound counter overflow: enforce Linux eventfd maximum counter
         ceiling (new_counter < dev->counter || new_counter == (eventfd_t)-1)
         to prevent counter from reaching reserved (eventfd_t)-1.
    
    Assisted-by: Google Gemini <gemini-3.8-flash>
    Signed-off-by: Swatantra Yadav <[email protected]>
---
 fs/vfs/fs_eventfd.c | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/fs/vfs/fs_eventfd.c b/fs/vfs/fs_eventfd.c
index a10dba9c118..ece6f6af024 100644
--- a/fs/vfs/fs_eventfd.c
+++ b/fs/vfs/fs_eventfd.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/config.h>
 #include <stdio.h>
+#include <string.h>
 #include <poll.h>
 #include <assert.h>
 #include <errno.h>
@@ -274,9 +275,15 @@ static ssize_t eventfd_do_read(FAR struct file *filep, FAR 
char *buffer,
 {
   FAR struct eventfd_priv_s *dev = filep->f_priv;
   FAR eventfd_waiter_sem_t *cur_sem;
+  eventfd_t value;
   ssize_t ret;
 
-  if (len < sizeof(eventfd_t) || buffer == NULL)
+  if (buffer == NULL)
+    {
+      return -EFAULT;
+    }
+
+  if (len < sizeof(eventfd_t))
     {
       return -EINVAL;
     }
@@ -318,15 +325,17 @@ static ssize_t eventfd_do_read(FAR struct file *filep, 
FAR char *buffer,
 
   if ((filep->f_oflags & EFD_SEMAPHORE) != 0)
     {
-      *(FAR eventfd_t *)buffer = 1;
+      value = 1;
       dev->counter -= 1;
     }
   else
     {
-      *(FAR eventfd_t *)buffer = dev->counter;
+      value = dev->counter;
       dev->counter = 0;
     }
 
+  memcpy(buffer, &value, sizeof(eventfd_t));
+
 #ifdef CONFIG_EVENT_FD_POLL
   /* Notify all poll/select waiters */
 
@@ -354,11 +363,22 @@ static ssize_t eventfd_do_write(FAR struct file *filep,
   FAR struct eventfd_priv_s *dev = filep->f_priv;
   FAR eventfd_waiter_sem_t *cur_sem;
   eventfd_t new_counter;
+  eventfd_t value;
   ssize_t ret;
 
-  if (len < sizeof(eventfd_t) || buffer == NULL ||
-      (*(FAR eventfd_t *)buffer == (eventfd_t)-1) ||
-      (*(FAR eventfd_t *)buffer == (eventfd_t)0))
+  if (buffer == NULL)
+    {
+      return -EFAULT;
+    }
+
+  if (len < sizeof(eventfd_t))
+    {
+      return -EINVAL;
+    }
+
+  memcpy(&value, buffer, sizeof(eventfd_t));
+
+  if (value == (eventfd_t)-1 || value == (eventfd_t)0)
     {
       return -EINVAL;
     }
@@ -369,9 +389,9 @@ static ssize_t eventfd_do_write(FAR struct file *filep,
       return ret;
     }
 
-  new_counter = dev->counter + *(FAR eventfd_t *)buffer;
+  new_counter = dev->counter + value;
 
-  if (new_counter < dev->counter)
+  if (new_counter < dev->counter || new_counter == (eventfd_t)-1)
     {
       eventfd_waiter_sem_t sem;
 
@@ -393,8 +413,8 @@ static ssize_t eventfd_do_write(FAR struct file *filep,
               return ret;
             }
         }
-      while ((new_counter = dev->counter + *(FAR eventfd_t *)buffer)
-            < dev->counter);
+      while ((new_counter = dev->counter + value) < dev->counter ||
+             new_counter == (eventfd_t)-1);
 
       nxsem_destroy(&sem.sem);
     }

Reply via email to