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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4535EC19F2A for ; Mon, 8 Aug 2022 02:03:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243994AbiHHCAm (ORCPT ); Sun, 7 Aug 2022 22:00:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243944AbiHHB4k (ORCPT ); Sun, 7 Aug 2022 21:56:40 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1022E1CB26; Sun, 7 Aug 2022 18:40:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 99AE1B80E05; Mon, 8 Aug 2022 01:40:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86FDFC433D6; Mon, 8 Aug 2022 01:40:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922803; bh=FPDq19YmQbyACbhIMdsFfnd/zvD9KE4s0mLFIVXUVOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gm/PcT96YUtsx4iuP87h22UoAsFi4CSdKSvvxGBkUlM60J77eZ+6qdjRBrT93HAU7 UWMfYzV62XUbIbMQ4euPf706fEVQzW9B760grpjf7dcUtEaONSVClWP5nPl/bq0VZr tk1KImjdS0SJuyp1XCrYNIrg6kW4AQiBzI7ygwQbdzF2FX/zVfJIlgYH+hwsPM3YuV 6G8gthH1WqystQIc2eUcb19kuGezd/vXTcbbL7ojrj5+jv/wN8RD3fIzoQGwHUoqrq IhtKwRi7Cih0oibs7Edoxnv1o4/JzVGrBhdXbrq/z+3sd2N6WExqTGXkroePGNpIxb 3dtF5XqSue2rg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiu Jianfeng , Paul Moore , Sasha Levin , stephen.smalley.work@gmail.com, eparis@parisplace.org, selinux@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 12/12] selinux: Add boundary check in put_entry() Date: Sun, 7 Aug 2022 21:39:42 -0400 Message-Id: <20220808013943.316907-12-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013943.316907-1-sashal@kernel.org> References: <20220808013943.316907-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiu Jianfeng [ Upstream commit 15ec76fb29be31df2bccb30fc09875274cba2776 ] Just like next_entry(), boundary check is necessary to prevent memory out-of-bound access. Signed-off-by: Xiu Jianfeng Signed-off-by: Paul Moore Signed-off-by: Sasha Levin --- security/selinux/ss/policydb.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/security/selinux/ss/policydb.h b/security/selinux/ss/policydb.h index 215f8f30ac5a..2a479785ebd4 100644 --- a/security/selinux/ss/policydb.h +++ b/security/selinux/ss/policydb.h @@ -360,6 +360,8 @@ static inline int put_entry(const void *buf, size_t bytes, int num, struct polic { size_t len = bytes * num; + if (len > fp->len) + return -EINVAL; memcpy(fp->data, buf, len); fp->data += len; fp->len -= len; -- 2.35.1