Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp661298img; Fri, 22 Mar 2019 06:07:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqyydz8Mqg8KaAOsj50U4kTl147pJiSA3So3pA5QyVK2oO6q3WchL+91w+78Z9ivaPqa85rL X-Received: by 2002:a65:6149:: with SMTP id o9mr8822089pgv.315.1553260060250; Fri, 22 Mar 2019 06:07:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553260060; cv=none; d=google.com; s=arc-20160816; b=ohki8ZzJE3dpFSrn0tJwrizzz+qEVv1DyAjABvE1zEOQBR+VZn8JDzI01jXRT+QqFo oCKXDh0901JuJuUd77fy7bn2G5XU4axzsN6t92RpmCWX/bZg63wJmtZuTWEYvDsrt94c rxQSce2YqxQPjpyuDGHdpYUPCthOTQrfZBdSQ8qHX+Tdft9cv9P8E+oJZfxfI3H3j4Yc OXek5RTY6WL1zN8Lqd+CGU2tt6QXVwaB6dPeFBgQl4o94f4V2RBpudYq1dAj9X2KaqML /iesjgwBBSgAWvc5BibUJLXNiKRFkvqp0WbQTezh+U71tfm848nkMOUNihliH7vDxD4X FcDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HaLIqckkXQL/KqGzWE+Y5plA+aWwMMCVJaoK/xLI3vE=; b=B4F35JBD6nNyjHCKBp0nLGbYdKhAsiUohLaR8hzKBVUq5MvaSPcGZfH5cjNfG7uA4q Ix2lQ+lAOStY+mVYXNKAQCc6ktaYFjzs8sGyQ6kRhFiu/kdb7mgM7sVW2LnqGG9huZ9w kED8igGueTWmagPMfUM0CZqfQM996wGVaup1L2zjt+tLp/g6YKfByptiBn+sufy7Z4Mc T5zyyaQl3FVaQWY728n0t2IZ9HyWXejkgVosIOIVvmZaSFEQHPbO772YItR9QWljn0mn SyOvF1ECb18rDa1suofmvoPknkSpM0Z9cZXIDALnbj+m+5oxC+vE/P3Nd3PPdaSfRKds j41w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0cZy3viv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q137si3753834pgq.58.2019.03.22.06.07.24; Fri, 22 Mar 2019 06:07:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0cZy3viv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730801AbfCVLhI (ORCPT + 99 others); Fri, 22 Mar 2019 07:37:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:38576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730771AbfCVLhF (ORCPT ); Fri, 22 Mar 2019 07:37:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 21C6B21934; Fri, 22 Mar 2019 11:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254624; bh=ied5yJSNtajlcy7nSMoskGfMkeo+nM8ek7mVYxSn5vQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0cZy3vivffmToOY4i9B2fH7sdeoUZhAy9ya6Algf/goofqL14C6oI1e408G8W6vVo 8RCSj3mtI8JlRG27C/avc4kYU95Egj+A1ww5OCs5LKkRFpEsxq4cI9N27onJAG2i5m JogVXHOREMUK/kO8k+2cnj7UNSlQ/bmHZOzgFQwM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Shishkin Subject: [PATCH 4.4 177/230] stm class: Prevent division by zero Date: Fri, 22 Mar 2019 12:15:15 +0100 Message-Id: <20190322111249.165701465@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111236.796964179@linuxfoundation.org> References: <20190322111236.796964179@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Shishkin commit bf7cbaae0831252b416f375ca9b1027ecd4642dd upstream. Using STP_POLICY_ID_SET ioctl command with dummy_stm device, or any STM device that supplies zero mmio channel size, will trigger a division by zero bug in the kernel. Prevent this by disallowing channel widths other than 1 for such devices. Signed-off-by: Alexander Shishkin Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices") CC: stable@vger.kernel.org # v4.4+ Signed-off-by: Greg Kroah-Hartman --- drivers/hwtracing/stm/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -477,7 +477,7 @@ static int stm_char_policy_set_ioctl(str { struct stm_device *stm = stmf->stm; struct stp_policy_id *id; - int ret = -EINVAL; + int ret = -EINVAL, wlimit = 1; u32 size; if (stmf->output.nr_chans) @@ -505,8 +505,10 @@ static int stm_char_policy_set_ioctl(str if (id->__reserved_0 || id->__reserved_1) goto err_free; - if (id->width < 1 || - id->width > PAGE_SIZE / stm->data->sw_mmiosz) + if (stm->data->sw_mmiosz) + wlimit = PAGE_SIZE / stm->data->sw_mmiosz; + + if (id->width < 1 || id->width > wlimit) goto err_free; ret = stm_file_assign(stmf, id->id, id->width);