Phonet: check destination before delivering packets locally (4b8f704b) · Commits · e / devices / android_kernel_fairphone_FP5

net/phonet/af_phonet.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -275,8 +275,6 @@ static inline int can_respond(struct sk_buff *skb)
		return 0;

		ph = pn_hdr(skb);
		if (phonet_address_get(skb->dev, ph->pn_rdev) != ph->pn_rdev)
		return 0; /* we are not the destination */
		if (ph->pn_res == PN_PREFIX && !pskb_may_pull(skb, 5))
		return 0;
		if (ph->pn_res == PN_COMMGR) /* indications */
		@@ -344,8 +342,8 @@ static int phonet_rcv(struct sk_buff skb, struct net_device dev,
		struct packet_type *pkttype,
		struct net_device *orig_dev)
		{
		struct net *net = dev_net(dev);
		struct phonethdr *ph;
		struct sock *sk;
		struct sockaddr_pn sa;
		u16 len;

		@@ -364,21 +362,21 @@ static int phonet_rcv(struct sk_buff skb, struct net_device dev,
		skb_reset_transport_header(skb);

		pn_skb_get_dst_sockaddr(skb, &sa);
		if (pn_sockaddr_get_addr(&sa) == 0)
		goto out; /* currently, we cannot be device 0 */

		sk = pn_find_sock_by_sa(dev_net(dev), &sa);
		if (sk == NULL) {
		/* check if we are the destination */
		if (phonet_address_lookup(net, pn_sockaddr_get_addr(&sa)) == 0) {
		/* Phonet packet input */
		struct sock *sk = pn_find_sock_by_sa(net, &sa);

		if (sk)
		return sk_receive_skb(sk, skb, 0);

		if (can_respond(skb)) {
		send_obj_unreachable(skb);
		send_reset_indications(skb);
		}
		goto out;
		}

		/* Push data to the socket (or other sockets connected to it). */
		return sk_receive_skb(sk, skb, 0);

		out:
		kfree_skb(skb);
		return NET_RX_DROP;