fix(mem/fs): fix(mem/fs): test all lseek cases for negative file offsets

Co-authored-by: Martin Kröning <[email protected]>

Author: fogti

src/fs/mem.rs

@@ -100,22 +100,16 @@ impl ObjectInterface for RomFileInterface {
 		let data_len = guard.data.len() as isize;
 
 		let new_pos = match whence {
-			SeekWhence::Set => {
-				if offset < 0 {
-					return Err(Errno::Inval);
-				}
-
-				offset
-			}
+			SeekWhence::Set => offset,
 			SeekWhence::Cur => (*pos_guard as isize)
 				.checked_add(offset)
 				.ok_or(Errno::Overflow)?,
 			SeekWhence::End => data_len.checked_add(offset).ok_or(Errno::Overflow)?,
 			_ => return Err(Errno::Inval),
 		};
 
-		if new_pos <= data_len {
-			*pos_guard = new_pos.try_into().unwrap();
+		if (0..=data_len).contains(&new_pos) {
+			*pos_guard = new_pos as usize;
 			Ok(new_pos)
 		} else {
 			Err(Errno::Inval)
@@ -237,25 +231,23 @@ impl ObjectInterface for RamFileInterface {
 		let data_len = guard.data.len() as isize;
 
 		let new_pos = match whence {
-			SeekWhence::Set => {
-				if offset < 0 {
-					return Err(Errno::Inval);
-				}
-
-				offset
-			}
+			SeekWhence::Set => offset,
 			SeekWhence::Cur => (*pos_guard as isize)
 				.checked_add(offset)
 				.ok_or(Errno::Overflow)?,
 			SeekWhence::End => data_len.checked_add(offset).ok_or(Errno::Overflow)?,
 			_ => return Err(Errno::Inval),
 		};
 
+		if new_pos < 0 {
+			return Err(Errno::Inval);
+		}
+
 		if new_pos > data_len {
 			guard.data.resize(new_pos.try_into().unwrap(), 0);
 			guard.attr.st_size = guard.data.len().try_into().unwrap();
 		}
-		*pos_guard = new_pos.try_into().unwrap();
+		*pos_guard = new_pos as usize;
 
 		Ok(new_pos)
 	}