Skip to content

nexus: fix GroupId::operator!= typo and UAF in pack_iodelay #1661

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

Closed
taskx6004 wants to merge 1 commit into from
Closed

nexus: fix GroupId::operator!= typo and UAF in pack_iodelay #1661

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 nexus/archdefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ struct GroupId
int8_t x = 0, y = 0;

bool operator==(const GroupId &other) const { return (type == other.type) && (x == other.x) && (y == other.y); }
bool operator!=(const GroupId &other) const { return (type != other.type) || (x != other.x) || (y == other.y); }
bool operator!=(const GroupId &other) const { return (type != other.type) || (x != other.x) || (y != other.y); }
unsigned int hash() const { return mkhash(mkhash(x, y), int(type)); }
};

Expand Down
5 changes: 4 additions & 1 deletion nexus/pack.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,10 @@ struct NexusPacker
base_iodelay_rules[id_DELAYB].param_xform[id_DEL_VALUE] = ctx->id("DELAY.DEL_VALUE");
base_iodelay_rules[id_DELAYB].param_xform[id_COARSE_DELAY] = ctx->id("DELAY.COARSE_DELAY");

base_iodelay_rules[id_DELAYA] = base_iodelay_rules[id_DELAYB];
{
XFormRule delayb_copy = base_iodelay_rules.at(id_DELAYB);
base_iodelay_rules[id_DELAYA] = std::move(delayb_copy);
}

base_iodelay_rules[id_DELAYA].param_xform[id_COARSE_DELAY_MODE] = ctx->id("DELAY.COARSE_DELAY_MODE");
base_iodelay_rules[id_DELAYA].param_xform[id_EDGE_MONITOR] = ctx->id("DELAY.EDGE_MONITOR");
Expand Down