proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 10:56:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2618 from pacovn/PVS-Studio_library_warnings

Browse Source 
pimd: standard library usage (PVS-Studio)
This commit is contained in:
Quentin Young 2018-07-06 11:23:29 -04:00 committed by GitHub
commit e8ec11787b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pimd/mtracebis_netlink.c
View File

@ -489,7 +489,6 @@ int rtnl_listen(struct rtnl_handle *rtnl, rtnl_filter_t handler, void *jarg)
int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler, void *jarg) int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler, void *jarg)
{ {
int status;
struct sockaddr_nl nladdr; struct sockaddr_nl nladdr;
char buf[8192]; char buf[8192];
struct nlmsghdr *h = (void *)buf; struct nlmsghdr *h = (void *)buf;
@ -500,37 +499,43 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler, void *jarg)
nladdr.nl_groups = 0; nladdr.nl_groups = 0;
while (1) { while (1) {
int err, len; int err;
int l; size_t l, rl, arl;
status = fread(&buf, 1, sizeof(*h), rtnl); rl = sizeof(*h);
arl = fread(&buf, 1, rl, rtnl);
if (status < 0) { if (arl != rl) {
if (errno == EINTR) if (arl == 0)
continue; return 0;
perror("rtnl_from_file: fread");
return -1;
}
if (status == 0)
return 0;
len = h->nlmsg_len; if (ferror(rtnl))
l = len - sizeof(*h); fprintf(stderr, "%s: header read failed\n",
__func__);
if (l < 0 || len > (int)sizeof(buf)) { else
fprintf(stderr, "!!!malformed message: len=%d @%lu\n", fprintf(stderr, "%s: truncated header\n",
len, ftell(rtnl)); __func__);
return -1; return -1;
} }
status = fread(NLMSG_DATA(h), 1, NLMSG_ALIGN(l), rtnl); l = h->nlmsg_len > rl ? h->nlmsg_len - rl : 0;
if (status < 0) { if (l == 0 || (l + (size_t)NLMSG_HDRLEN) > sizeof(buf)) {
perror("rtnl_from_file: fread"); fprintf(stderr, "%s: malformed message: len=%zu @%lu\n",
__func__, (size_t)h->nlmsg_len, ftell(rtnl));
return -1; return -1;
} }
if (status < l) {
fprintf(stderr, "rtnl-from_file: truncated message\n"); rl = NLMSG_ALIGN(l);
arl = fread(NLMSG_DATA(h), 1, rl, rtnl);
if (arl != rl) {
if (ferror(rtnl))
fprintf(stderr, "%s: msg read failed\n",
__func__);
else
fprintf(stderr, "%s: truncated message\n",
__func__);
return -1; return -1;
} }