diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-12-14 15:52:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-17 21:59:14 -0800 |
| commit | a3d384029aa304f8f3f5355d35f0ae274454f7cd (patch) | |
| tree | 6bdb628b439cde292317fa5e89e14977899855a5 /net/rose/rose_loopback.c | |
| parent | a159aaa328a02b0189774c58ae7d917b25d26852 (diff) | |
| download | blackbird-op-linux-a3d384029aa304f8f3f5355d35f0ae274454f7cd.tar.gz blackbird-op-linux-a3d384029aa304f8f3f5355d35f0ae274454f7cd.zip | |
[AX.25]: Fix unchecked rose_add_loopback_neigh uses
rose_add_loopback_neigh uses kmalloc and the callers were ignoring the
error value. Rewrite to let the caller deal with the allocation. This
allows the use of static allocation of kmalloc use entirely.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose/rose_loopback.c')
| -rw-r--r-- | net/rose/rose_loopback.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rose/rose_loopback.c b/net/rose/rose_loopback.c index 103b4d38f88a..3e41bd93ab9f 100644 --- a/net/rose/rose_loopback.c +++ b/net/rose/rose_loopback.c @@ -79,7 +79,8 @@ static void rose_loopback_timer(unsigned long param) skb->h.raw = skb->data; - if ((sk = rose_find_socket(lci_o, rose_loopback_neigh)) != NULL) { + sk = rose_find_socket(lci_o, &rose_loopback_neigh); + if (sk) { if (rose_process_rx_frame(sk, skb) == 0) kfree_skb(skb); continue; @@ -87,7 +88,7 @@ static void rose_loopback_timer(unsigned long param) if (frametype == ROSE_CALL_REQUEST) { if ((dev = rose_dev_get(dest)) != NULL) { - if (rose_rx_call_request(skb, dev, rose_loopback_neigh, lci_o) == 0) + if (rose_rx_call_request(skb, dev, &rose_loopback_neigh, lci_o) == 0) kfree_skb(skb); } else { kfree_skb(skb); |
