Skip to content

clamp packet length in zyfer_receive to bound a_lastcode #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arib06 wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

clamp packet length in zyfer_receive to bound a_lastcode #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ntpd/refclock_zyfer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,14 @@ zyfer_receive(
else
return;
} else {
memcpy(pp->a_lastcode + pp->lencode, p, rbufp->recv_length);
pp->lencode += rbufp->recv_length;
int rlen = rbufp->recv_length;

/* clamp to the space left in a_lastcode so a long
follow-up packet can not overrun the buffer */
if (rlen > BMAX - 1 - pp->lencode)
rlen = BMAX - 1 - pp->lencode;
memcpy(pp->a_lastcode + pp->lencode, p, (size_t)rlen);
pp->lencode += rlen;
pp->a_lastcode[pp->lencode] = '\0';
}

Expand Down