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 X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 736B0C43613 for ; Thu, 20 Jun 2019 18:06:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48C75204FD for ; Thu, 20 Jun 2019 18:06:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561053991; bh=x7wSzYAg5Z3U5c4Cr/R9upcHWEUgoG1se+17GB55b8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rU1bcufObA5Hchhl/rL+edCcbV7zDIhGjRohO1DOV/QF+tOdfx54aWPLzGfmvNfwP mD1Cj4JLYaC73kdsCC75w7Akpe1gsm0kj5eQ/4RHC6pBeieTp+RNL21hAJdx4m8XFy rj5KKPLYXsv0EiCrZ0zeuB+q/mWva6JkbZlhmAPI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727967AbfFTSG3 (ORCPT ); Thu, 20 Jun 2019 14:06:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:60652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726798AbfFTSG3 (ORCPT ); Thu, 20 Jun 2019 14:06:29 -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 84485204FD; Thu, 20 Jun 2019 18:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561053988; bh=x7wSzYAg5Z3U5c4Cr/R9upcHWEUgoG1se+17GB55b8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aj/j2p/WGsAe1dfLM/zL9WbaKQOkcjgCj1rKdHX3p3fjnUFrXg2hjy2xe4Zv4iS7d kni6pe4qLHmo44Fw/0HvP3OK3B/UFyDMYEnz/lPnv7Lc3O5QUPEC7xrHFTtyUtL+RP qdKYYRckw0NKlHiO4FBgDgqv1PhVm65HAzutbJh4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Weinelt , Dan Carpenter Subject: [PATCH 4.9 096/117] Revert "staging: vc04_services: prevent integer overflow in create_pagelist()" Date: Thu, 20 Jun 2019 19:57:10 +0200 Message-Id: <20190620174357.661920821@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190620174351.964339809@linuxfoundation.org> References: <20190620174351.964339809@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Greg Kroah-Hartman This reverts commit cf07331c8827c9e9e0b4274c9b60204c18592241 which was commit ca641bae6da977d638458e78cd1487b6160a2718 upstream. Martin writes: This commit breaks the kernel build because the vchiq_pagelist_info struct is not defined in v4.9.182. It was only added in v4.10, in commit 4807f2c0e684e907c501cb96049809d7a957dbc2. Reported-by: Martin Weinelt Cc: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 9 --------- 1 file changed, 9 deletions(-) --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -381,18 +381,9 @@ create_pagelist(char __user *buf, size_t int run, addridx, actual_pages; unsigned long *need_release; - if (count >= INT_MAX - PAGE_SIZE) - return NULL; - offset = (unsigned int)buf & (PAGE_SIZE - 1); num_pages = (count + offset + PAGE_SIZE - 1) / PAGE_SIZE; - if (num_pages > (SIZE_MAX - sizeof(PAGELIST_T) - - sizeof(struct vchiq_pagelist_info)) / - (sizeof(u32) + sizeof(pages[0]) + - sizeof(struct scatterlist))) - return NULL; - *ppagelist = NULL; /* Allocate enough storage to hold the page pointers and the page