Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Mateusz Jurczyk <mjurczyk@google.com>,
        Julian Wiedmann <jwi@linux.vnet.ibm.com>,
        "David S . Miller" <davem@davemloft.net>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.9 143/293] af_iucv: Move sockaddr length checks
 to before accessing sa_family in bind and connect handlers
Thread-Topic: [PATCH AUTOSEL for 4.9 143/293] af_iucv: Move sockaddr length
 checks to before accessing sa_family in bind and connect handlers
Thread-Index: AQHTz5kotnHqDknhCEixYxwFMqGesQ==
Date:   Mon, 9 Apr 2018 00:24:44 +0000
Message-ID: <20180409002239.163177-143-alexander.levin@microsoft.com>
References: <20180409002239.163177-1-alexander.levin@microsoft.com>
In-Reply-To: <20180409002239.163177-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 6d5d6eed-bd46-4a98-a368-08d59db11946
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:24:44.7532
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0807
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Mateusz Jurczyk <mjurczyk@google.com>

[ Upstream commit e3c42b61ff813921ba58cfc0019e3fd63f651190 ]

Verify that the caller-provided sockaddr structure is large enough to
contain the sa_family field, before accessing it in bind() and connect()
handlers of the AF_IUCV socket. Since neither syscall enforces a minimum
size of the corresponding memory region, very short sockaddrs (zero or
one byte long) result in operating on uninitialized memory while
referencing .sa_family.

Fixes: 52a82e23b9f2 ("af_iucv: Validate socket address length in iucv_sock_=
bind()")
Signed-off-by: Mateusz Jurczyk <mjurczyk@google.com>
[jwi: removed unneeded null-check for addr]
Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 net/iucv/af_iucv.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index c2dfc32eb9f2..a69003fbf5b9 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -708,10 +708,8 @@ static int iucv_sock_bind(struct socket *sock, struct =
sockaddr *addr,
 	char uid[9];
=20
 	/* Verify the input sockaddr */
-	if (!addr || addr->sa_family !=3D AF_IUCV)
-		return -EINVAL;
-
-	if (addr_len < sizeof(struct sockaddr_iucv))
+	if (addr_len < sizeof(struct sockaddr_iucv) ||
+	    addr->sa_family !=3D AF_IUCV)
 		return -EINVAL;
=20
 	lock_sock(sk);
@@ -855,7 +853,7 @@ static int iucv_sock_connect(struct socket *sock, struc=
t sockaddr *addr,
 	struct iucv_sock *iucv =3D iucv_sk(sk);
 	int err;
=20
-	if (addr->sa_family !=3D AF_IUCV || alen < sizeof(struct sockaddr_iucv))
+	if (alen < sizeof(struct sockaddr_iucv) || addr->sa_family !=3D AF_IUCV)
 		return -EINVAL;
=20
 	if (sk->sk_state !=3D IUCV_OPEN && sk->sk_state !=3D IUCV_BOUND)
--=20
2.15.1