From patchwork Wed Mar 10 07:51:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 12127205 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 5D2D8C4332B for ; Wed, 10 Mar 2021 07:52:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FAAE64FF2 for ; Wed, 10 Mar 2021 07:52:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231319AbhCJHvu (ORCPT ); Wed, 10 Mar 2021 02:51:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231183AbhCJHvc (ORCPT ); Wed, 10 Mar 2021 02:51:32 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DCFEC061761 for ; Tue, 9 Mar 2021 23:51:32 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id e19so36651045ejt.3 for ; Tue, 09 Mar 2021 23:51:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=f3NyUVmUs5v8cil49pIJNqQQz4DaHo1vkszaPirCaxo=; b=Ypi3V62zNn07jIH5RVoVdvyATHjdPZWvOc3LNNjQoId5D2k9IGXQL24cMW9mAgL5Dc ASvsAmXd6mVLYFyqHMea/C5A5MACaZZRMEsbycjakNbxNH8mOzi5zqnHLPhkwO5qJ2Ax 2/UjIkgkp1OqXua8BWWQymaja4VbKI3HgWmgQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=f3NyUVmUs5v8cil49pIJNqQQz4DaHo1vkszaPirCaxo=; b=EFKcVlbR49/Ft6DdJOUe5PWVuWEePRt+Vys5tW0aj5P1mEK4rqs890b+jE0+BVlwO8 7D1kVUTpjutUNbdm2F7BC1EiBVC+ghrUvk6zlVc0JN9NbxskdlQisgb4oTqquzmSaO95 dFtdp7aT9kVYJtD/cRSdzK/MRGEUxxSfyx5QBZmvVtfjcK+FZCmTWLOYE1CFuXGGzis5 QL/akfL/Ya5WLP7kXzPjP3OihsEped+lV7UvHRaCqKQq32QIlKF2LBLX7+h3KYiQgf81 fmMKO1qcy1FDk/8+OSye4zg29oijn3WDZUN3mjESS7InMHoBEpmEEgfZ1dTfXfii3cyj CIMg== X-Gm-Message-State: AOAM532iaYI3MTrUA2z0Tz8L8lgc1PxcXC+m2TbX+4AL4n7geTrFoW23 YNa2Wc7sJGh89aHdGyRgJqbX5w== X-Google-Smtp-Source: ABdhPJzSKcWgVNaL6kreWfdn6+jX0OeM/ZbsAuRfopka4VQCGRuudEO5alraEKo30Pa5K7awra6LJA== X-Received: by 2002:a17:906:130c:: with SMTP id w12mr2224583ejb.253.1615362690959; Tue, 09 Mar 2021 23:51:30 -0800 (PST) Received: from alco.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id gj13sm9097940ejb.118.2021.03.09.23.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Mar 2021 23:51:30 -0800 (PST) From: Ricardo Ribalda To: Tomasz Figa , Marek Szyprowski , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby Cc: Ricardo Ribalda , Sergey Senozhatsky , stable@vger.kernel.org Subject: [PATCH v2] media: videobuf2: Fix integer overrun in vb2_mmap Date: Wed, 10 Mar 2021 08:51:27 +0100 Message-Id: <20210310075127.1045556-1-ribalda@chromium.org> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The plane_length is an unsigned integer. So, if we have a size of 0xffffffff bytes we incorrectly allocate 0 bytes instead of 1 << 32. Suggested-by: Sergey Senozhatsky Cc: stable@vger.kernel.org Fixes: 7f8414594e47 ("[media] media: videobuf2: fix the length check for mmap") Reviewed-by: Sergey Senozhatsky Signed-off-by: Ricardo Ribalda Acked-by: Tomasz Figa --- drivers/media/common/videobuf2/videobuf2-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 543da515c761..89c8bacb94a7 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -2256,7 +2256,7 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma) * The buffer length was page_aligned at __vb2_buf_mem_alloc(), * so, we need to do the same here. */ - length = PAGE_ALIGN(vb->planes[plane].length); + length = PAGE_ALIGN((unsigned long)vb->planes[plane].length); if (length < (vma->vm_end - vma->vm_start)) { dprintk(q, 1, "MMAP invalid, as it would overflow buffer length\n");