Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 778c1c72 authored by Ravinder Konka's avatar Ravinder Konka Committed by Gerrit - the friendly Code Review server
Browse files

Netfilter: IRC: Copy nickname to proper address 



Fix to copy nickname to address provided by
nickname pointer and avoid overwriting
pointer value.

Change-Id: I8746d8249e807299ae3bec36f6ed9934d8c1628a
Signed-off-by: default avatarMohammed Javid <mjavid@codeaurora.org>
Acked-by: default avatarSudhanshu Singh <sudhsing@qti.qualcomm.com>
parent 4f5a0984

net/netfilter/nf_conntrack_irc.c

+6 −5
Original line number Diff line number Diff line
@@ -155,11 +155,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;

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