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 17BEEC19F2A for ; Mon, 8 Aug 2022 01:38:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242569AbiHHBiV (ORCPT ); Sun, 7 Aug 2022 21:38:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242474AbiHHBgu (ORCPT ); Sun, 7 Aug 2022 21:36:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B511FBE31; Sun, 7 Aug 2022 18:33:38 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 51BCE60DB9; Mon, 8 Aug 2022 01:33:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D50EAC433C1; Mon, 8 Aug 2022 01:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922417; bh=VJCmYCac8+0GtJU2jX1P9L9/IdytulRpy/aYEWsiEso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U241++5m7O03Qy5CYM056QlRGhhkm3HhSrLFVMRhX9AmqjgaX3SdbG4vSqC3X5D2D mwe2NLbyzjteUa2vW7b9p1wuoJIDE/Y6CcPRI21NgH9+rxFb9I4/XHqt8cPTjd9egj t62YlQkYoeLin1hEW+zKNtDp0IgfyaxaDgBgThQFU1r25llhXvTzG3QfpRhjHeN4I8 vrE6ewBgbYBuFC0uVBHOk3wjTZIsdtDcgehGGjOrCUEzSCPSp3sRN1WdOiCCsVKNms 6fUlSY2r/vTNZAMCnDh8eBrxK1ZG/Ql6yMJBQUaUxeh7+2wrSMVTrb/0MRIFBEndiw xzt1UnE++5SMQ== 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 5.19 54/58] selinux: Add boundary check in put_entry() Date: Sun, 7 Aug 2022 21:31:12 -0400 Message-Id: <20220808013118.313965-54-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013118.313965-1-sashal@kernel.org> References: <20220808013118.313965-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 c24d4e1063ea..ffc4e7bad205 100644 --- a/security/selinux/ss/policydb.h +++ b/security/selinux/ss/policydb.h @@ -370,6 +370,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