summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2019-03-14 13:47:59 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-21 10:35:02 +0100
commit7ae3525ee708f867a2d2321c246b285136cdbed8 (patch)
tree7b1ef828f695e720dcadb472c4f818094d90c371 /include/linux
parent385bddaf5ee11acdf8d823ecc429c675b5416ac2 (diff)
appletalk: Fix potential NULL pointer dereference in unregister_snap_client
commit 9804501fa1228048857910a6bf23e085aade37cc upstream. register_snap_client may return NULL, all the callers check it, but only print a warning. This will result in NULL pointer dereference in unregister_snap_client and other places. It has always been used like this since v2.6 Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> [bwh: Backported to <4.15: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/atalk.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index af43ed404ff4..4be0e14b38fc 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -107,7 +107,7 @@ static __inline__ struct elapaarp *aarp_hdr(struct sk_buff *skb)
#define AARP_RESOLVE_TIME (10 * HZ)
extern struct datalink_proto *ddp_dl, *aarp_dl;
-extern void aarp_proto_init(void);
+extern int aarp_proto_init(void);
/* Inter module exports */