osmocom
/
libosmo-netif
mirror of https://gerrit.osmocom.org/libosmo-netif
11
0
Fork 0
Code Issues Releases Wiki Activity

osmo-amr-inspect: Improve robustness reading from stdin 

Fixes printing hexbuf which might not have been null-terminated.

Related: SYS#6161
Fixes: Coverity CID#302068
Change-Id: I460f1deb7455b3b6a85a090bdcad8e21a883db68
This commit is contained in:
Pau Espin 2023-01-03 11:40:04 +01:00
parent a1c9fbfabc
commit 38047fd20a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
utils/osmo-amr-inspect.c
View File

@ -241,26 +241,32 @@ free_ret:
static int read_stdin(void)
{
ssize_t rc;
size_t hex_buflen;
char hex_buf[4096];
uint8_t buf[2048];
rc = read(0, hex_buf, sizeof(hex_buf));
rc = read(0, hex_buf, sizeof(hex_buf) - 1);
if (rc < 0) {
fprintf(stderr, "Failed reading stdin: %s\n", strerror(errno));
return -EIO;
}
if (rc == sizeof(hex_buf)) {
fprintf(stderr, "Failed parsing (input too long)\n");
hex_buflen = rc;
hex_buf[hex_buflen] = '\0';
if (hex_buflen == sizeof(hex_buf) - 1) {
fprintf(stderr, "Failed parsing (input too long > %lu): %s\n", hex_buflen, hex_buf);
return -ENOMEM;
}
rc = osmo_hexparse(hex_buf, buf, rc);
rc = osmo_hexparse(hex_buf, buf, sizeof(buf));
if (rc < 0) {
fprintf(stderr, "Failed parsing (hexparse error): %s\n", hex_buf);
return -1;
}
if (rc < 2) {
fprintf(stderr, "Too short to be an AMR buffer (%ld bytes): %s\n", rc, buf);
fprintf(stderr, "Too short to be an AMR buffer (%ld bytes): %s\n", rc, hex_buf);
return -1;
}
inspect_amr(0, buf, rc);
return 0;
}