Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp623981pxv; Thu, 15 Jul 2021 11:49:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfRVxFS5UIySaLLaSc3EolYEksz3+bNYLOaAeRMzJ3tZcdC9r10rYN+CB1GYdBchPC+vTo X-Received: by 2002:a5d:88c6:: with SMTP id i6mr4328591iol.75.1626374965482; Thu, 15 Jul 2021 11:49:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626374965; cv=none; d=google.com; s=arc-20160816; b=A519yJ63xRMwT5hhkrFsI/6yqP4lSMVBLi9EH8vuHG/jK7ISZkciUMDWKrrPKQsP9h NGGYR/Otb/JyKqds2rH4fh8fnOV/R/7c4XTye+SyhIPv2jG211PwUzR+ZPj4lvMV8Z4z 1wf6urEFAUXo7ZuqNYUETfwr3N5kToCVOANfouDEpin/4xlno1gpFHtQ+zgdl69v6UEQ ZYPG8HaA/J/dVBJ/hHIBUJZKREu1ZdsywByecjOjo601ZneWQn9pkixQRjpY0VR/sgjS OoKH5eglImnCM8W/749oaSM1lWpsTU5FZCn/Q2GkHRnkVGzL7KK+N1VhECs7U9F4DwoO u95Q== 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=59gNjz+6/BAVwNhEkUeeYn9yaymUpOIxY7VaWFjRLCo=; b=pn//qDrVBKs3J2nGekICccXBsxx69r/fXPRgI2sSUaAblNNIcEQGiuDd6627FfyF33 EN6wrN7sOQ26GvZ+A6X1K3W/4L5aHq3izd447fYLfO05CR1Wp88Npe4nYtgk4XMSk0ow xmqSP+W71RHQ4lw20cLX4r2laTGmQki35mh1cfixOtcRLuQfUhLNtoQyqskPa/C2DpVF yx7gT62cz/FMHeZwQssYBoLxQJ8pu3jcWaGTjyF6iakrorNdd/6a2xlIN/h5+oz6NZl+ 9QG4EINNWFoiZbeI0mW/+GGdv+Cd9BWtw/yV7WrNxJSBaGrZanyWjqRfiJWpg/c8DHIz tSGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QXifiURn; 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 z10si8135783ioq.37.2021.07.15.11.49.13; Thu, 15 Jul 2021 11:49:25 -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=QXifiURn; 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 S238644AbhGOSve (ORCPT + 99 others); Thu, 15 Jul 2021 14:51:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:51052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238569AbhGOSsg (ORCPT ); Thu, 15 Jul 2021 14:48:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 40758613D0; Thu, 15 Jul 2021 18:45:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626374742; bh=MmUcVmridg/W1qxCAFO9DhyMR/BAKWiopdjliI5rFQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QXifiURn0ICKGGYEYgSQGn/ro4BQLewyzhqLQNLbCgdsMRNtvj5+7Q0caoYEKBOGU j88wbD34aADlRFFwiaSnH528Y3K3snCOLrSWFH7Yc6cLD+/xr/RaOqKDWFm/0x4sgr 0lCVh8cZKh/gzpXWo388lTGnMIzSgmAu/880+rVo= 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 5.4 122/122] smackfs: restrict bytes count in smk_set_cipso() Date: Thu, 15 Jul 2021 20:39:29 +0200 Message-Id: <20210715182523.618299046@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182448.393443551@linuxfoundation.org> References: <20210715182448.393443551@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 5.4 122/122] 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 @@ -855,6 +855,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))