X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=net%2Fax25%2Faf_ax25.c;h=69940a723abd347ddfbe02f0f99dee2ba5a23554;hb=HEAD;hp=e277e38f736b93a133a6cd43cc7b264acfbad641;hpb=fcba914542082b272f31c8e4c40000b88ed3208d;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index e277e38f736b..69940a723abd 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -806,6 +806,9 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,
 	struct sock *sk;
 	ax25_cb *ax25;
 
+	if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
+		return -EINVAL;
+
 	if (!net_eq(net, &init_net))
 		return -EAFNOSUPPORT;
 
@@ -1636,11 +1639,11 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,
 
 	skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
 
-	if (msg->msg_namelen != 0) {
-		struct sockaddr_ax25 *sax = (struct sockaddr_ax25 *)msg->msg_name;
+	if (msg->msg_name) {
 		ax25_digi digi;
 		ax25_address src;
 		const unsigned char *mac = skb_mac_header(skb);
+		struct sockaddr_ax25 *sax = msg->msg_name;
 
 		memset(sax, 0, sizeof(struct full_sockaddr_ax25));
 		ax25_addr_parse(mac + 1, skb->data - mac - 1, &src, NULL,