Skip to content

Fix four crash and memory-safety bugs (issues #18, #140, #152, #256) #298

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
thegushi wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix four crash and memory-safety bugs (issues #18, #140, #152, #256) #298

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
2 changes: 1 addition & 1 deletion libopendmarc/opendmarc_policy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@ opendmarc_policy_fetch_ruf(DMARC_POLICY_T *pctx, u_char *list_buf, size_t size_o
{
return NULL;
}
if (list_buf != NULL || size_of_buf > 0)
if (list_buf != NULL && size_of_buf > 0)
{
(void) memset(list_buf, '\0', size_of_buf);
sp = list_buf;
Expand Down
55 changes: 55 additions & 0 deletions libopendmarc/tests/test_dmarc_fetch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,60 @@ main(int argc, char **argv)
printf("\t%s(%d): opendmarc_policy_fetch_adkim: expected %d got %d: FAIL\n", __FILE__, __LINE__, DMARC_RECORD_A_STRICT, aspf);
fails += 1;
}

/*
** Regression tests for issue #256: opendmarc_policy_fetch_ruf() and
** opendmarc_policy_fetch_rua() used || instead of && when checking
** whether to call memset(), so passing NULL with a non-zero size would
** call memset(NULL, ...) and segfault.
*/

/* NULL buf + zero size: normal call pattern, must not crash */
count++;
if (opendmarc_policy_fetch_ruf(pctx, NULL, 0, 1) == NULL)
{
printf("\t%s(%d): fetch_ruf(NULL, 0): FAIL\n", __FILE__, __LINE__);
fails += 1;
}

/* NULL buf + non-zero size: the crash case before the fix */
count++;
(void) opendmarc_policy_fetch_ruf(pctx, NULL, 256, 1);
/* reaching here without crashing is the pass condition */

/* valid buf: confirm ruf list is returned */
count++;
{
u_char buf[256];
u_char *ret = opendmarc_policy_fetch_ruf(pctx, buf, sizeof buf, 1);
if (ret == NULL)
{
printf("\t%s(%d): fetch_ruf with valid buf returned NULL: FAIL\n", __FILE__, __LINE__);
fails += 1;
}
}

/* Same three cases for fetch_rua */
count++;
if (opendmarc_policy_fetch_rua(pctx, NULL, 0, 1) == NULL)
{
printf("\t%s(%d): fetch_rua(NULL, 0): FAIL\n", __FILE__, __LINE__);
fails += 1;
}

count++;
(void) opendmarc_policy_fetch_rua(pctx, NULL, 256, 1);

count++;
{
u_char buf[256];
u_char *ret = opendmarc_policy_fetch_rua(pctx, buf, sizeof buf, 1);
if (ret == NULL)
{
printf("\t%s(%d): fetch_rua with valid buf returned NULL: FAIL\n", __FILE__, __LINE__);
fails += 1;
}
}

return fails;
}
2 changes: 1 addition & 1 deletion opendmarc/opendmarc-ar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ ares_parse(u_char *hdr, struct authres *ar)
int r = 0;
int state;
int prevstate;
u_char tmp[MAXHEADER + 2];
u_char tmp[MAXHEADER + 1];
u_char *tokens[ARES_MAXTOKENS];

assert(hdr != NULL);
Expand Down
4 changes: 1 addition & 3 deletions opendmarc/opendmarc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2213,7 +2213,7 @@ mlfi_envfrom(SMFICTX *ctx, char **envfrom)

p = strchr(dfc->mctx_envfrom, '@');
if (p != NULL)
strncpy(dfc->mctx_envdomain, p + 1, BUFRSZ);
strlcpy(dfc->mctx_envdomain, p + 1, sizeof dfc->mctx_envdomain);
}

return SMFIS_CONTINUE;
Expand Down Expand Up @@ -4159,8 +4159,6 @@ static void
dmarcf_config_free(struct dmarcf_config *conf)
{
assert(conf != NULL);
assert(conf->conf_refcnt == 0);

if (conf->conf_data != NULL)
config_free(conf->conf_data);

Expand Down
2 changes: 1 addition & 1 deletion opendmarc/opendmarc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#define DEFREPORTCMD "/usr/sbin/sendmail -t -odq"
#define JOBIDUNKNOWN "(unknown-jobid)"
#define MAXARGV 65536
#define MAXHEADER 1024
#define MAXHEADER 4096
#define TEMPFILE "/var/tmp/dmarcXXXXXX"

#define AUTHRESULTSHDR "Authentication-Results"
Expand Down