Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp179330pxb; Mon, 13 Sep 2021 16:22:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0Rgz/U00YjjOgnoj0ZyPVvK9xGPa5bKZcIVmrDZtvyv18rQNtBg8m+X9za+bRvewNS/23 X-Received: by 2002:a17:906:7302:: with SMTP id di2mr16141607ejc.409.1631575329318; Mon, 13 Sep 2021 16:22:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631575329; cv=none; d=google.com; s=arc-20160816; b=puCuOa9K3jx4EzdCN0akTEd1rUMr4odQNdWkpIjc5MY0Zuq8ZoMH3LO9j3r5RnshXx cgOqwSpJlZP597m7VfwgyhrphH7AR+Btwf9ye4xP0B2TofRYTGC76d9vTEdsP1F7Flmw YzjmCfFu7Fwg/46RFSaqi5BrcqNFShDtmMXCMRSo5gPbv6O+dtkqgK7EHq9OhPeqaMTo YnJKLS6APl7DywI4lXFluwy7QIkOw5o3rSNTs8CH+wnK2H5sF9FNhrG/KHcAh/kP5ymy me/766p8TtTgUsxV09qKaUnXDyr5dsDx0Q8ghrW83gYOKCQy5uCE9ETTfbA5if1jQB2y +IKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q8COQcBswpNzmg4svc2qsfy4X7nWmvvs7+1H7HCIKZ4=; b=TcFGETpJxvEVaYapjBxtW79pn8nsaIpmA5GSrpkWPYLWmr+E9gfVK2ATiURJ9hxUMq VVAPXGPzHZ3aD+dA+0siRWr0HGTUXUPBPzoW2X4cYW+9PLMN5bZNJgW/oHif7QaqEfSj wo5dlCcM+YrUug7oDBczin8CHJqc4hV9IXk9Gr1Vg8Y96zezLojEdFNRqYxq/KQYX8IA UVmlXCx7+nCI5c2EYWu9fntFC3RV1hTfjcEhjMVHeHFhVPgzjBqWbvXjDIFqFwi2LSxa noBSX4A/lD9eF2+74mRAsyEF75AnzRwINXspiB64sk/vHSb5f7029UjDdFhJ9gX/CBnC 7ozQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rx05806U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h12si11400595edb.262.2021.09.13.16.21.46; Mon, 13 Sep 2021 16:22:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rx05806U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345927AbhIMOsF (ORCPT + 99 others); Mon, 13 Sep 2021 10:48:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:58814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346436AbhIMOmY (ORCPT ); Mon, 13 Sep 2021 10:42:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 685D460FF2; Mon, 13 Sep 2021 13:56:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631541406; bh=JRGX/Lop0/dOvKLFORGazAXF1hzRTdd/R6m1yGKy9PY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rx05806UoNiMUrs+CWUtmAwhIPfFUPkci4dTatYw0zFGg9IwEGSTmpKSXYyMdIDPY SnTffR1ZvP+yDFLQOP8pVmolYVWz8YaSQjW3CgGxurio7bnMHu6Vvpv8ZM7I5/NGny A9/tCMdtb2L6DXH89sXHQbtltzx0vn0nJDWaTP3s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , "David S. Miller" , Sasha Levin Subject: [PATCH 5.14 286/334] net: qrtr: make checks in qrtr_endpoint_post() stricter Date: Mon, 13 Sep 2021 15:15:40 +0200 Message-Id: <20210913131123.091601343@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131113.390368911@linuxfoundation.org> References: <20210913131113.390368911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit aaa8e4922c887ff47ad66ef918193682bccc1905 ] These checks are still not strict enough. The main problem is that if "cb->type == QRTR_TYPE_NEW_SERVER" is true then "len - hdrlen" is guaranteed to be 4 but we need to be at least 16 bytes. In fact, we can reject everything smaller than sizeof(*pkt) which is 20 bytes. Also I don't like the ALIGN(size, 4). It's better to just insist that data is needs to be aligned at the start. Fixes: 0baa99ee353c ("net: qrtr: Allow non-immediate node routing") Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/qrtr/qrtr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index 0c30908628ba..bdbda61db8b9 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) goto err; } - if (!size || len != ALIGN(size, 4) + hdrlen) + if (!size || size & 3 || len != size + hdrlen) goto err; if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA && @@ -506,8 +506,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) if (cb->type == QRTR_TYPE_NEW_SERVER) { /* Remote node endpoint can bridge other distant nodes */ - const struct qrtr_ctrl_pkt *pkt = data + hdrlen; + const struct qrtr_ctrl_pkt *pkt; + if (size < sizeof(*pkt)) + goto err; + + pkt = data + hdrlen; qrtr_node_assign(node, le32_to_cpu(pkt->server.node)); } -- 2.30.2