Merge "Netfilter: IRC: Copy nickname to proper address" (2c534a27) · Commits · e / devices / android_kernel_xiaomi_markw

net/netfilter/nf_conntrack_irc.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -156,11 +156,12 @@ 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))
		(temp->nickname_len == (nick_end - nick_start))) {
		if (memcmp(nick_start, temp->nickname,
		temp->nickname_len) == 0)
		return false;
		}
		}
		return true;
		}

		@@ -197,7 +198,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);