tcp, tcp_splice: False "Negative array index read" positives, CWE-129
A flag or event bit is always set by callers. Reported by Coverity. Signed-by-off: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
264d68edcf
commit
2a3b8dad33
2 changed files with 24 additions and 12 deletions
12
tcp.c
12
tcp.c
|
@ -868,15 +868,19 @@ static void conn_flag_do(const struct ctx *c, struct tcp_conn *conn,
|
|||
return;
|
||||
|
||||
conn->flags &= flag;
|
||||
debug("TCP: index %li: %s dropped", conn - tc,
|
||||
tcp_flag_str[fls(~flag)]);
|
||||
if (fls(~flag) >= 0) {
|
||||
debug("TCP: index %li: %s dropped", conn - tc,
|
||||
tcp_flag_str[fls(~flag)]);
|
||||
}
|
||||
} else {
|
||||
if (conn->flags & flag)
|
||||
return;
|
||||
|
||||
conn->flags |= flag;
|
||||
debug("TCP: index %li: %s", conn - tc,
|
||||
tcp_flag_str[fls(flag)]);
|
||||
if (fls(flag) >= 0) {
|
||||
debug("TCP: index %li: %s", conn - tc,
|
||||
tcp_flag_str[fls(flag)]);
|
||||
}
|
||||
}
|
||||
|
||||
if (flag == STALLED || flag == ~STALLED)
|
||||
|
|
24
tcp_splice.c
24
tcp_splice.c
|
@ -170,15 +170,19 @@ static void conn_flag_do(const struct ctx *c, struct tcp_splice_conn *conn,
|
|||
return;
|
||||
|
||||
conn->flags &= flag;
|
||||
debug("TCP (spliced): index %li: %s dropped", conn - tc,
|
||||
tcp_splice_flag_str[fls(~flag)]);
|
||||
if (fls(~flag) >= 0) {
|
||||
debug("TCP (spliced): index %li: %s dropped", conn - tc,
|
||||
tcp_splice_flag_str[fls(~flag)]);
|
||||
}
|
||||
} else {
|
||||
if (conn->flags & flag)
|
||||
return;
|
||||
|
||||
conn->flags |= flag;
|
||||
debug("TCP (spliced): index %li: %s", conn - tc,
|
||||
tcp_splice_flag_str[fls(flag)]);
|
||||
if (fls(flag) >= 0) {
|
||||
debug("TCP (spliced): index %li: %s", conn - tc,
|
||||
tcp_splice_flag_str[fls(flag)]);
|
||||
}
|
||||
}
|
||||
|
||||
if (flag == CLOSING)
|
||||
|
@ -250,15 +254,19 @@ static void conn_event_do(const struct ctx *c, struct tcp_splice_conn *conn,
|
|||
return;
|
||||
|
||||
conn->events &= event;
|
||||
debug("TCP (spliced): index %li, ~%s", conn - tc,
|
||||
tcp_splice_event_str[fls(~event)]);
|
||||
if (fls(~event) >= 0) {
|
||||
debug("TCP (spliced): index %li, ~%s", conn - tc,
|
||||
tcp_splice_event_str[fls(~event)]);
|
||||
}
|
||||
} else {
|
||||
if (conn->events & event)
|
||||
return;
|
||||
|
||||
conn->events |= event;
|
||||
debug("TCP (spliced): index %li, %s", conn - tc,
|
||||
tcp_splice_event_str[fls(event)]);
|
||||
if (fls(event) >= 0) {
|
||||
debug("TCP (spliced): index %li, %s", conn - tc,
|
||||
tcp_splice_event_str[fls(event)]);
|
||||
}
|
||||
}
|
||||
|
||||
if (tcp_splice_epoll_ctl(c, conn))
|
||||
|
|
Loading…
Reference in a new issue