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 81F9F18BBB2 for ; Mon, 7 Oct 2024 17:20:11 +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=1728321611; cv=none; b=Qd8w6jWa3L/hYmOvQ082Am346OykGTWU2VzW0efE+wG0w2xlP/ALwtmidRx5OdzIZNMrvbgg3/dd2+z5mElxxgU1tiIQ8YmU0Qbo7yXwFrsuXVyR0xKwXJyC7SHrVBsXVetdnq/WC5mV8DCdRQRwNdpKGeSIDl6UaU69KW6Dyus= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728321611; c=relaxed/simple; bh=ns3CXLk3/G2y6ZyYmiPhh3pqniqzrN1yF4KXqJJb9oY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ohFSRFsCRmCExe7IcbmpkzESaqzXGODvBWKZIfEFfLczbxdFVoS9HLKLSAnMbjtWbOmDeXwYaHXOTS7KHwDkA4bBE8W3tDBKgbJWfkjWdLrXyh0fSzkn3UfevMNNlcG1oevXRgiTGYC6lDxoP9IQTAYJ6u1uC+1M5h0ycOE5pdM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gv9ZuXkF; 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="gv9ZuXkF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D97D3C4CEC7; Mon, 7 Oct 2024 17:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728321611; bh=ns3CXLk3/G2y6ZyYmiPhh3pqniqzrN1yF4KXqJJb9oY=; h=Subject:To:Cc:From:Date:From; b=gv9ZuXkFD1zRBQz/rj8xFWKjq9pzXXyHItxvqSCCYweykQE1MhJphO9lavqhClyr3 GLqjsFW9/2EOMVYC7u9DVRgFXGdWN4cDGlgFQFSLedGRYcTuBpdp7IsaNOl/t8PKmu OtVsTkovU4Gt9qBP3ZEYOLZswriY3QZqBugnAQp4= Subject: FAILED: patch "[PATCH] uprobes: fix kernel info leak via "[uprobes]" vma" failed to apply to 6.6-stable tree To: oleg@redhat.com,mhiramat@kernel.org,will@kernel.org Cc: From: Date: Mon, 07 Oct 2024 19:19:59 +0200 Message-ID: <2024100758-mossy-data-89d8@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=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-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-6.6.y git checkout FETCH_HEAD git cherry-pick -x 34820304cc2cd1804ee1f8f3504ec77813d29c8e # git commit -s git send-email --to '' --in-reply-to '2024100758-mossy-data-89d8@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: 34820304cc2c ("uprobes: fix kernel info leak via "[uprobes]" vma") 2abbcc099ec6 ("uprobes: turn xol_area->pages[2] into xol_area->page") 6d27a31ef195 ("uprobes: introduce the global struct vm_special_mapping xol_mapping") ff474a78cef5 ("uprobe: Add uretprobe syscall to speed up return probe") 1713b63a07a2 ("x86/shstk: Make return uprobe work with shadow stack") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 34820304cc2cd1804ee1f8f3504ec77813d29c8e Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sun, 29 Sep 2024 18:20:47 +0200 Subject: [PATCH] uprobes: fix kernel info leak via "[uprobes]" vma xol_add_vma() maps the uninitialized page allocated by __create_xol_area() into userspace. On some architectures (x86) this memory is readable even without VM_READ, VM_EXEC results in the same pgprot_t as VM_EXEC|VM_READ, although this doesn't really matter, debugger can read this memory anyway. Link: https://lore.kernel.org/all/20240929162047.GA12611@redhat.com/ Reported-by: Will Deacon Fixes: d4b3b6384f98 ("uprobes/core: Allocate XOL slots for uprobes use") Cc: stable@vger.kernel.org Acked-by: Masami Hiramatsu (Google) Signed-off-by: Oleg Nesterov Signed-off-by: Masami Hiramatsu (Google) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 2ec796e2f055..4b52cb2ae6d6 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1545,7 +1545,7 @@ static struct xol_area *__create_xol_area(unsigned long vaddr) if (!area->bitmap) goto free_area; - area->page = alloc_page(GFP_HIGHUSER); + area->page = alloc_page(GFP_HIGHUSER | __GFP_ZERO); if (!area->page) goto free_bitmap;