Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3797051pxv; Mon, 19 Jul 2021 08:59:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9W6sAhELLu5yfSs3T5NwO/Bu1IucZiNh3amIHNAGE39f38rPMGQt6j52O1ftZoe7BQd5e X-Received: by 2002:a92:cec5:: with SMTP id z5mr16520359ilq.226.1626710374413; Mon, 19 Jul 2021 08:59:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626710374; cv=none; d=google.com; s=arc-20160816; b=i+0in0irAA/qRqvT7OWQzNJPn1ulZVDsO7ruu9XlTRJEA3puJ1STfyEtj5M9JUCX5I 8AVWjtcsoWpfSLHF1k/mH0xaJ3CHHtGlgjLnB8HHi4AqeZUm/WXRHTEby8AyrJSonWjm C35ZttPXprdQAXWev9W5YGxFaydGI4ZDhZRBVPeXHZFzKUryZBzyoamwizb+tMnnFize zcRFnW4usTJieQbhecMF2aV45cvcpDOcXa5VBppGHUwJ9huKcwnPA7IYRvl4SR8+Mr4u attdHblqeAouyMjW1aqH3PNTl51ZpUCWGOWhneIwU1q57MEB4B/ktf2sDYDuX8yxUUhE sIzQ== 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=UkdoAXh6aOaGBlQ/1W48qfbjq1ZuRwD3YIyH/Ns0swM=; b=t/SiUB57+eM4EuXYX4+KMUtGZtHXvxRHfakyj3Ijl2qJvea6NlEUZrOC7+Nn/OhCbg DK4yUnEN3xnjI+ogkxI4IOYpmahYgMLTJ2O9oa8csZxuqJiOIn4KaTSLiz/KZHWOjxOj IaHql5PKsUl0MePfEYdhZz3W4iQQ5Y5zItXIIsRhkZi1OIChdAhoqrhUCyjvYYg8ILlO 2SPtZEGNStbDCkp8qcFriUYlczgXsd0oUPY/ksvdHDXnriAx3qI0YEA1dtm4OpBiDQ6+ TL9bytBDwWpcWBbhngWbt4oBbMH/Z8EQIEBwlhsW6vowiVcVe9fhF8mUnFGtTp6j640t zw6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kejQVIbv; 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 o6si20715230ilk.70.2021.07.19.08.59.22; Mon, 19 Jul 2021 08:59:34 -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=kejQVIbv; 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 S1346381AbhGSPRN (ORCPT + 99 others); Mon, 19 Jul 2021 11:17:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:40450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245412AbhGSOr1 (ORCPT ); Mon, 19 Jul 2021 10:47:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 187816113E; Mon, 19 Jul 2021 15:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708222; bh=2AaJMXPyTNzGPT0DezVUCbPTaRMDdBxQtVMbc6OcCXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kejQVIbvt2CWyuL5PscAZTCkoCqWx5AkkN/yGyCHYYDTcdv7Y2bu0sRDHdSgqmY09 fa3HKoFZFcB0IgVaZdxTc/S8gun5Ko84ZvvkDdQZd4VcrK3bcK06J0qN4GajQlvthp NiZbPfKSV9SuPvWi4gOe05PHorRU6RhK0KBCkJ2Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot , Tetsuo Handa , Casey Schaufler Subject: [PATCH 4.14 229/315] smackfs: restrict bytes count in smk_set_cipso() Date: Mon, 19 Jul 2021 16:51:58 +0200 Message-Id: <20210719144950.953110881@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.861561397@linuxfoundation.org> References: <20210719144942.861561397@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: Tetsuo Handa commit 49ec114a6e62d8d320037ce71c1aaf9650b3cafd upstream. Oops, I failed to update subject line. >From 07571157c91b98ce1a4aa70967531e64b78e8346 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Mon, 12 Apr 2021 22:25:06 +0900 Subject: [PATCH 4.14 229/315] smackfs: restrict bytes count in smk_set_cipso() Commit 7ef4c19d245f3dc2 ("smackfs: restrict bytes count in smackfs write functions") missed that count > SMK_CIPSOMAX check applies to only format == SMK_FIXED24_FMT case. Reported-by: syzbot Signed-off-by: Tetsuo Handa Signed-off-by: Casey Schaufler Signed-off-by: Greg Kroah-Hartman --- security/smack/smackfs.c | 2 ++ 1 file changed, 2 insertions(+) --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -883,6 +883,8 @@ static ssize_t smk_set_cipso(struct file if (format == SMK_FIXED24_FMT && (count < SMK_CIPSOMIN || count > SMK_CIPSOMAX)) return -EINVAL; + if (count > PAGE_SIZE) + return -EINVAL; data = memdup_user_nul(buf, count); if (IS_ERR(data))