summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2019-03-14 13:47:59 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-17 20:38:59 +0100
commit39de8cc3678f5cd1f4e0ae274c20acabbd85a8b1 (patch)
treef140164db177df8c9dafc8be3c442e98510bb78c /include
parentf70609f898d63973388b36adf3650489311b13b9 (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')
-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 03885e63f92b..2664b9e89f9b 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -108,7 +108,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 */