Skip to content
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

libatalk: Restore invalid metadata cleanup in ad_open.c #513

Merged
merged 1 commit into from
Oct 6, 2023
Merged

libatalk: Restore invalid metadata cleanup in ad_open.c #513

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
24 changes: 4 additions & 20 deletions libatalk/adouble/ad_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,14 +803,6 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, const struct
EC_FAIL;
}

/*
* Since recent CVE fixes have introduced new behavior regarding
* ad_entry() output. For now, we will AFP_ASSERT() in EC_CLEANUP to prevent
* altering on-disk info. This does introduce an avenue to DOS
* the netatalk server by locally writing garbage to the EA. At this
* point, the outcome is an acceptable risk to prevent unintended
* changes to metadata.
*/
if (nentries != ADEID_NUM_EA
|| !ad_entry(ad, ADEID_FINDERI)
|| !ad_entry(ad, ADEID_COMMENT)
Expand All @@ -820,12 +812,6 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, const struct
|| !ad_entry(ad, ADEID_PRIVINO)
|| !ad_entry(ad, ADEID_PRIVSYN)
|| !ad_entry(ad, ADEID_PRIVID)) {
LOG(log_error, logtype_ad,
"ad_header_read_ea(\"%s\"): invalid metadata EA "
"this is now being treated as a fatal error. "
"if you see this log entry, please file a bug ticket "
"with your upstream vendor and attach the generated "
"core file.", path ? fullpathname(path) : "UNKNOWN");

errno = EINVAL;
EC_FAIL;
Expand All @@ -839,19 +825,17 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, const struct
ad_setentryoff(ad, ADEID_RFORK, ADEDOFF_RFORK_OSX);
#endif

// TODO: Remove the assert and restore the branch for cleaning up invalid metadata
// https://github.com/Netatalk/netatalk/issues/400
EC_CLEANUP:
AFP_ASSERT(!(ret != 0 && errno == EINVAL));
#if 0
if (ret != 0 && errno == EINVAL) {
become_root();
(void)sys_removexattr(path, AD_EA_META);
unbecome_root();
LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): deleted invalid metadata EA", fullpathname(path), nentries);
LOG(log_error, logtype_ad,
"ad_header_read_ea(%s, %d): deleted invalid metadata EA",
path ? fullpathname(path) : "UNKNOWN", nentries);

errno = ENOENT;
}
#endif
EC_EXIT;
}

Expand Down