Merge "Netfilter: IRC: Copy nickname to proper address"

This commit is contained in:
qctecmdr 2020-11-05 01:57:24 -08:00 • committed by Gerrit - the friendly Code Review server
commit 7c87f5b6eb

View file

@ -150,10 +150,11 @@ static bool mangle_ip(struct nf_conn *ct,
*do not mangle the DCC Server IP
*/
if (temp->server_ip == tuple->dst.u3.ip &&
(temp->nickname_len == nick_end - nick_start) &&
(memcmp(nick_start, temp->nickname,
temp->nickname_len) == 0))
return false;
(temp->nickname_len == (nick_end - nick_start))) {
if (memcmp(nick_start, temp->nickname,
temp->nickname_len) == 0)
return false;
}
}
return true;
}
@ -191,7 +192,7 @@ static int handle_nickname(struct nf_conn *ct,
kmalloc(i, GFP_ATOMIC);
if (temp->nickname) {
temp->nickname_len = i;
memcpy(&temp->nickname,
memcpy(temp->nickname,
nick_start, temp->nickname_len);
} else {
list_del(&temp->ptr);