1 files changed, 11 insertions, 0 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index d122e89..1992d46 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -187,6 +187,7 @@ fd_rw(unsigned int fd, void *buf, size_t count, uint8_t write)
     sio.buf = kbuf;
     sio.offset = filedes->offset;
 
+    spinlock_acquire(&filedes->lock);
     if (write) {
         /* Copy in user buffer */
         if (copyin(buf, kbuf, count) < 0) {
@@ -205,16 +206,26 @@ fd_rw(unsigned int fd, void *buf, size_t count, uint8_t write)
             goto done;
         }
 
+        /* End of file? */
+        if (n == 0) {
+            retval = 0;
+            goto done;
+        }
+
         if (copyout(kbuf, buf, count) < 0) {
             retval = -EFAULT;
             goto done;
         }
     }
+
+    /* Increment the offset per read */
+    filedes->offset += n;
     retval = count;
 done:
     if (kbuf != NULL) {
         dynfree(kbuf);
     }
+    spinlock_release(&filedes->lock);
     return retval;
 }