From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C4836BB58 for ; Wed, 19 Jun 2024 06:58:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718780336; cv=none; b=Jj1frRHk5NuV4VdjxJ3VTkMBS1yrh7B1XXJcGFGPZQS9JtdMkyBPFOHvw4OTHyxBFxcHZSN9KNCTpNgEAC7IFoOwj+4ArmSGMJogTt+wGlIvg7ywT/iE0Gi/8mgTVWt1RPsN8h3mE3lnQmw/rY3RwK/6etpbKRhSYBcujFpA8j0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718780336; c=relaxed/simple; bh=U236WpfyDR2L754Ysfp41WHTmvzXaJXInnGnouWntUk=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=kGgf9o2mRBJJSKCCBAZMZCxTY9yvQYh++t6R1w/qPNtfpzrxX9RtEqUhkNsdsEd6/n+aNqPqIvR2opwYLU4FvGnGUtvOlKwAWdnJI6S107H0hWnayOBu2FwqCY/WX1hnqgm2rgKgE/XQwfz0OKQG93rIXX4g6y0DYzbGfCKcT44= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pk4zCel7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="pk4zCel7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91EBAC2BBFC; Wed, 19 Jun 2024 06:58:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718780336; bh=U236WpfyDR2L754Ysfp41WHTmvzXaJXInnGnouWntUk=; h=Subject:To:Cc:From:Date:From; b=pk4zCel7ObRhCqsxbv0WuNaowgo2B8fYCBBX1mpZ8DJzyvlqT1qcvXGRyndHCi95E C5yrgl0PNATLotm54ilJtt0xxhZlah3PKDE8822Bjwp4V+WLBcodK2FxdLiERgMxCB A/JY4dKo1vugvw+Yivi0NVNPHVwTykAzdPfAUaDg= Subject: FAILED: patch "[PATCH] drm/shmem-helper: Fix BUG_ON() on mmap(PROT_WRITE," failed to apply to 5.15-stable tree To: karol.wachowski@intel.com,airlied@gmail.com,daniel.vetter@ffwll.ch,daniel@ffwll.ch,eric@anholt.net,jacek.lawrynowicz@linux.intel.com,maarten.lankhorst@linux.intel.com,mripard@kernel.org,noralf@tronnes.org,robh@kernel.org,stable@vger.kernel.org,tzimmermann@suse.de Cc: From: Date: Wed, 19 Jun 2024 08:58:45 +0200 Message-ID: <2024061944-culture-agreeable-2b0e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 39bc27bd688066a63e56f7f64ad34fae03fbe3b8 # git commit -s git send-email --to '' --in-reply-to '2024061944-culture-agreeable-2b0e@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 39bc27bd6880 ("drm/shmem-helper: Fix BUG_ON() on mmap(PROT_WRITE, MAP_PRIVATE)") 21aa27ddc582 ("drm/shmem-helper: Switch to reservation lock") 67fe7487fe89 ("drm/shmem-helper: Don't use vmap_use_count for dma-bufs") 3f6a1e22fae9 ("drm/shmem-helper: Switch to use drm_* debug helpers") aa8c85affe3f ("drm/shmem-helper: Fix locking for drm_gem_shmem_get_pages_sgt()") 09bf649a7457 ("drm/shmem-helper: Avoid vm_open error paths") 24013314be6e ("drm/shmem-helper: Remove errant put in error path") df4aaf015775 ("drm/shmem-helper: Add missing vunmap on error") 7938f4218168 ("dma-buf-map: Rename to iosys-map") ae710a458f0a ("drm: Replace kernel.h with the necessary inclusions") c47160d8edcd ("drm/mipi-dbi: Remove dependency on GEM CMA helper library") e580ea25c08d ("drm/cma-helper: Pass GEM CMA object in public interfaces") 05b1de51df07 ("drm/cma-helper: Export dedicated wrappers for GEM object functions") d0c4e34db0b0 ("drm/cma-helper: Move driver and file ops to the end of header") 6a2d2ddf2c34 ("drm: Move nomodeset kernel parameter to the DRM subsystem") d76f25d66ec8 ("drm/vboxvideo: Drop CONFIG_VGA_CONSOLE guard to call vgacon_text_force()") 35f7775f81bf ("drm: Don't print messages if drivers are disabled due nomodeset") a713ca234ea9 ("Merge drm/drm-next into drm-misc-next") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 39bc27bd688066a63e56f7f64ad34fae03fbe3b8 Mon Sep 17 00:00:00 2001 From: "Wachowski, Karol" Date: Mon, 20 May 2024 12:05:14 +0200 Subject: [PATCH] drm/shmem-helper: Fix BUG_ON() on mmap(PROT_WRITE, MAP_PRIVATE) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Lack of check for copy-on-write (COW) mapping in drm_gem_shmem_mmap allows users to call mmap with PROT_WRITE and MAP_PRIVATE flag causing a kernel panic due to BUG_ON in vmf_insert_pfn_prot: BUG_ON((vma->vm_flags & VM_PFNMAP) && is_cow_mapping(vma->vm_flags)); Return -EINVAL early if COW mapping is detected. This bug affects all drm drivers using default shmem helpers. It can be reproduced by this simple example: void *ptr = mmap(0, size, PROT_WRITE, MAP_PRIVATE, fd, mmap_offset); ptr[0] = 0; Fixes: 2194a63a818d ("drm: Add library for shmem backed GEM objects") Cc: Noralf Trønnes Cc: Eric Anholt Cc: Rob Herring Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Cc: # v5.2+ Signed-off-by: Wachowski, Karol Signed-off-by: Jacek Lawrynowicz Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20240520100514.925681-1-jacek.lawrynowicz@linux.intel.com diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index e435f986cd13..1ff0678be7c7 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -610,6 +610,9 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct return ret; } + if (is_cow_mapping(vma->vm_flags)) + return -EINVAL; + dma_resv_lock(shmem->base.resv, NULL); ret = drm_gem_shmem_get_pages(shmem); dma_resv_unlock(shmem->base.resv);