nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

mm/iob: Fix IOB length in iob_reserve

Browse source 
If we apply `iob_reserve` on an IOB with `io_offset != 0`, the `head->io_pktlen` and `iob->io_len` will become wrong value, because we only need to trim `offset - iob->io_offset`.

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng 2023-08-17 15:55:32 +08:00 committed by Xiang Xiao
parent 1a8027d625
commit e2c9aa6588
2 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
mm/iob/iob_reserve.c
View file

@ -41,20 +41,11 @@
void iob_reserve(FAR struct iob_s *iob, unsigned int reserved)
{
FAR struct iob_s *head = iob;
unsigned int offset;
int trimlen;
/* Empty iob buffer is allowed, update packet length. */
if (iob->io_pktlen > reserved)
{
iob->io_pktlen -= reserved;
}
else
{
iob->io_pktlen = 0;
}
/* Update offset and reducing the tail room */
/* Update offset and adjust packet length. */
while (iob != NULL && reserved > 0)
{
@ -67,16 +58,19 @@ void iob_reserve(FAR struct iob_s *iob, unsigned int reserved)
offset = reserved;
}
if (iob->io_len > offset)
trimlen = offset - iob->io_offset;
/* At most trim iob->io_len to 0. */
if ((int)(iob->io_len - trimlen) < 0)
{
iob->io_len -= offset;
}
else
{
iob->io_len = 0;
trimlen = iob->io_len;
}
iob->io_offset = offset;
head->io_pktlen -= trimlen;
iob->io_len -= trimlen;
iob->io_offset = offset;
iob = iob->io_flink;
reserved -= offset;
}

20
mm/iob/iob_test.c
View file

@ -161,6 +161,26 @@ int main(int argc, char **argv)
fprintf(stderr, "Buffer1 does not match buffer2\n");
}
nbytes = iob->io_pktlen;
iob_reserve(iob, 55);
printf("Reserve: adjust offset to 55\n");
dump_chain(iob);
if (iob->io_offset != 55 || iob->io_pktlen + 55 != nbytes)
{
fprintf(stderr, "Offset or packet length wrong\n");
}
iob_reserve(iob, 28);
printf("Reserve: adjust offset to 28\n");
dump_chain(iob);
if (iob->io_offset != 28 || iob->io_pktlen + 28 != nbytes)
{
fprintf(stderr, "Offset or packet length wrong\n");
}
while (iob) iob = iob_free(iob);
return EXIT_SUCCESS;
}