From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BB77C433E6 for ; Tue, 14 Jul 2020 19:12:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23F10221ED for ; Tue, 14 Jul 2020 19:12:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753955; bh=pK5WNn3f2XN+wqZ3aeM424pECkD6yi7cilRcgztjNcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gDBlpdcfqg5/Zt7WPCfOieNr4tw+jDxlSF3u9pmGF0onNZFzNXUUcHWXGXiDAN4Yn uDoCH0AzLClSB3ZmlB/V5uXfHRKTLX55g9YmMtcu9WUy/cZAy61lH36GAfjJWezjea Xl+lJsT0DkV8c/YO2o+aRDqB7GKkPQ2FT5mvLbhE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729621AbgGNSqz (ORCPT ); Tue, 14 Jul 2020 14:46:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:41766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729598AbgGNSqy (ORCPT ); Tue, 14 Jul 2020 14:46:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5B66522AAD; Tue, 14 Jul 2020 18:46:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752413; bh=pK5WNn3f2XN+wqZ3aeM424pECkD6yi7cilRcgztjNcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BptdoYTaHjjTTUaKNgtuuPh+U85Kv/j3Ra4A6TkoFsXrhmNtFyo08go2sMoA5bWhL QJeQfnnuw9ZSbem8YsScQ2XMEaEKKkPioZCIqbfobHCX8g92lObS4cO0UtVASRjgqQ 1Yuy50Uk6vZizKDkrvNL6gKFelOXXWFLOpen/2Qk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Manivannan Sadhasivam , syzbot+b8fe393f999a291a9ea6@syzkaller.appspotmail.com, Dan Carpenter , "David S. Miller" Subject: [PATCH 4.19 25/58] net: qrtr: Fix an out of bounds read qrtr_endpoint_post() Date: Tue, 14 Jul 2020 20:43:58 +0200 Message-Id: <20200714184057.392937689@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184056.149119318@linuxfoundation.org> References: <20200714184056.149119318@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter commit 8ff41cc21714704ef0158a546c3c4d07fae2c952 upstream. This code assumes that the user passed in enough data for a qrtr_hdr_v1 or qrtr_hdr_v2 struct, but it's not necessarily true. If the buffer is too small then it will read beyond the end. Reported-by: Manivannan Sadhasivam Reported-by: syzbot+b8fe393f999a291a9ea6@syzkaller.appspotmail.com Fixes: 194ccc88297a ("net: qrtr: Support decoding incoming v2 packets") Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/qrtr/qrtr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -266,7 +266,7 @@ int qrtr_endpoint_post(struct qrtr_endpo unsigned int ver; size_t hdrlen; - if (len & 3) + if (len == 0 || len & 3) return -EINVAL; skb = netdev_alloc_skb(NULL, len); @@ -280,6 +280,8 @@ int qrtr_endpoint_post(struct qrtr_endpo switch (ver) { case QRTR_PROTO_VER_1: + if (len < sizeof(*v1)) + goto err; v1 = data; hdrlen = sizeof(*v1); @@ -293,6 +295,8 @@ int qrtr_endpoint_post(struct qrtr_endpo size = le32_to_cpu(v1->size); break; case QRTR_PROTO_VER_2: + if (len < sizeof(*v2)) + goto err; v2 = data; hdrlen = sizeof(*v2) + v2->optlen;