Skip to content

Fix Xref pointer after buffer reallocation #369

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
kev009 wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −5
Open

Fix Xref pointer after buffer reallocation #369

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions doc/pod/news.pod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,14 @@ Support for old insecure OpenSSL and LibreSSL versions have been dropped.
You will have to use at least S<OpenSSL 1.1.1> or S<LibreSSL 2.8.0>. Thanks
to Roman Donchenko for the code simplification and cleaning.

=item *

Fixed a long-standing use-after-reallocation in B<innd> when generating the
Xref header field for an article crossposted to enough newsgroups to grow the
internal buffer. This bug could cause a spurious C<no matching entry in
storage.conf> error and throttle the server. Thanks to Jesse Rehmer for the
report.

=back

=head1 Changes in 2.7.5 (not yet released)
Expand Down
12 changes: 7 additions & 5 deletions innd/art.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,8 +1449,8 @@ ARTpoisongroup(char *name)
static bool
ARTassignnumbers(ARTDATA *data)
{
char *p, *q;
int i, len, linelen, buflen;
char *p;
int i, len, linelen, buflen, replicoffset;
NEWSGROUP *ngp;

if (data->XrefBufLength == 0) {
Expand All @@ -1459,7 +1459,9 @@ ARTassignnumbers(ARTDATA *data)
strncpy(data->Xref, Path.data, Path.used - 1);
}
len = Path.used - 1;
p = q = data->Xref + len;
/* Keep an offset because xrealloc() below may move the Xref buffer. */
replicoffset = len + 1;
p = data->Xref + len;
for (linelen = i = 0; (ngp = GroupPointers[i]) != NULL; i++) {
/* If already went to this group (i.e., multiple groups are aliased
* into it), then skip it. */
Expand Down Expand Up @@ -1509,8 +1511,8 @@ ARTassignnumbers(ARTDATA *data)
p[1] = '\n';
/* data->XrefLength includes trailing "\r\n". */
data->XrefLength = len + 2;
data->Replic = q + 1;
data->ReplicLength = len - (q + 1 - data->Xref);
data->Replic = data->Xref + replicoffset;
data->ReplicLength = len - replicoffset;

return true;
}
Expand Down