diff options
| author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2011-03-08 22:44:06 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-09 11:59:29 -0800 |
| commit | c69d4407d8884e8a127f95d07b1896443f3716ff (patch) | |
| tree | 85989f9259365d5470113e810237b567ba93af37 /net/phonet | |
| parent | 7b46ac4e77f3224a1befe032c77f1df31d1b42c4 (diff) | |
| download | op-kernel-dev-c69d4407d8884e8a127f95d07b1896443f3716ff.zip op-kernel-dev-c69d4407d8884e8a127f95d07b1896443f3716ff.tar.gz | |
Phonet: fix NULL dereference on TX path with implicit source
The previous Phonet patch series introduced per-socket implicit
destination (i.e. connect()). In that case, the destination
socket address is NULL in the transmit function.
However commit a8059512b120362b15424f152b2548fe8b11bd0c
("Phonet: implement per-socket destination/peer address")
is incomplete and would trigger a NULL dereference.
(Fortunately, the code is not in released kernel, and in fact
currently not reachable.)
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet')
| -rw-r--r-- | net/phonet/af_phonet.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index 30cc676..4706b77 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c @@ -262,10 +262,9 @@ int pn_skb_send(struct sock *sk, struct sk_buff *skb, else if (phonet_address_lookup(net, daddr) == 0) { dev = phonet_device_get(net); skb->pkt_type = PACKET_LOOPBACK; - } else if (pn_sockaddr_get_object(target) == 0) { + } else if (dst == 0) { /* Resource routing (small race until phonet_rcv()) */ - struct sock *sk = pn_find_sock_by_res(net, - target->spn_resource); + struct sock *sk = pn_find_sock_by_res(net, res); if (sk) { sock_put(sk); dev = phonet_device_get(net); |
