Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

mm/iob: Support negative offset when copyin/out.

Browse Source 
Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng
2023-01-18 19:58:52 +08:00
committed by Xiang Xiao
parent 0f35ad29a8
commit be89bcc044
5 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/iob/iob_copyin.c
+14 -7
View File
@@ -51,7 +51,7 @@
****************************************************************************/
static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
unsigned int len, unsigned int offset,
unsigned int len, int offset,
bool throttled, bool can_block)
{
FAR struct iob_s *head = iob;
@@ -61,23 +61,30 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
unsigned int avail;
unsigned int total = len;
iobinfo("iob=%p len=%u offset=%u\n", iob, len, offset);
iobinfo("iob=%p len=%u offset=%d\n", iob, len, offset);
DEBUGASSERT(iob && src);
/* The offset must applied to data that is already in the I/O buffer
* chain
*/
if (offset > iob->io_pktlen)
if ((int)(offset - iob->io_pktlen) > 0)
{
ioberr("ERROR: offset is past the end of data: %u > %u\n",
ioberr("ERROR: offset is past the end of data: %d > %u\n",
offset, iob->io_pktlen);
return -ESPIPE;
}
if ((int)(offset + iob->io_offset) < 0)
{
ioberr("ERROR: offset is before the start of data: %d < %d\n",
offset, -(int)iob->io_offset);
return -ESPIPE;
}
/* Skip to the I/O buffer containing the data offset */
while (offset > iob->io_len)
while ((int)(offset - iob->io_len) > 0)
{
offset -= iob->io_len;
iob = iob->io_flink;
@@ -216,7 +223,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
****************************************************************************/
int iob_copyin(FAR struct iob_s *iob, FAR const uint8_t *src,
unsigned int len, unsigned int offset, bool throttled)
unsigned int len, int offset, bool throttled)
{
return iob_copyin_internal(iob, src, len, offset, throttled, true);
}
@@ -232,7 +239,7 @@ int iob_copyin(FAR struct iob_s *iob, FAR const uint8_t *src,
****************************************************************************/
int iob_trycopyin(FAR struct iob_s *iob, FAR const uint8_t *src,
unsigned int len, unsigned int offset, bool throttled)
unsigned int len, int offset, bool throttled)
{
return iob_copyin_internal(iob, src, len, offset, throttled, false);
}
mm/iob/iob_copyout.c
+11 -2
View File
@@ -54,16 +54,25 @@
****************************************************************************/
int iob_copyout(FAR uint8_t *dest, FAR const struct iob_s *iob,
unsigned int len, unsigned int offset)
unsigned int len, int offset)
{
FAR const uint8_t *src;
unsigned int ncopy;
unsigned int avail;
unsigned int remaining;
/* The offset must applied to data that is in the I/O buffer chain */
if ((int)(offset + iob->io_offset) < 0)
{
ioberr("ERROR: offset is before the start of data: %d < %d\n",
offset, -(int)iob->io_offset);
return -ESPIPE;
}
/* Skip to the I/O buffer containing the offset */
while (offset >= iob->io_len)
while ((int)(offset - iob->io_len) >= 0)
{
offset -= iob->io_len;
iob = iob->io_flink;