From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D6153D567F for ; Wed, 5 Aug 2026 20:25:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785961531; cv=none; b=b1CEjM1ZuWqRAKKOnhYnU20mHPKfOm3gnmInwhWaWjncHCjgrVc2M7w/lXmRqjF75KbWko7T/NgW6f5LHr1nRroRvssDB9bsb3R5n0wF0MpCNHSOjkbyj9zkLJSpeHfGOYkju56chwh0jB1gDvj3rfRCzscFW0coqg8P79Fn0Hg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785961531; c=relaxed/simple; bh=XloeEc0VC7CzKRCx+z/BAvyR2vU4IIPzzZHEOTfwaI8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=GzwNmNCUemhwwNvwF+eb/YwRm6BWfQfnQapj9eriSeH61vwBHTWHPVAYPTN6E0YNv4vML+02Mntlcpy18mi8cXUSklx++AaFTXSjOFgIWwfz5rHGo1eDg73HSqppoFHkGLdH3plfwFcMDUehNY2Yvm71bRV90oTkoJmplHt2C+s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fmNTrwrV; arc=none smtp.client-ip=209.85.161.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fmNTrwrV" Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-6ab04bbcc8fso819016eaf.1 for ; Wed, 05 Aug 2026 13:25:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785961528; x=1786566328; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=8Qc29af7044Ktsuo50pkEIXiXat2x/FckVqq57fZa/0=; b=fmNTrwrVnsLagfbdhDNyca5miUrit5LAWnXzw0oUTMnUf18qufxR85EZcjZPp/5mWp fxnSs76zaxzHptHNJkIOLfj7joBCmHqz6ITIBUc2otKE8Hs3gb8svElLFZNPEeZy/sNA Wl0J4wu4vGHyhQVABwAGIiyrEKmMRtj9ybu4XIFy1EuX4NXnCm6w5aXpeekwWuG2ghq1 8xp+yPqg0Yi0MDHWDmuFPNHls6ClE1YWNeJrfeaZxovdQNW2jVCuziF9AVBEnkd47GA7 Dwn3wWr7u8JkOUTrUlmnK7ZO5GkxiWISLmj/nIkERi8ePpkPzrs5Y1j3ZE3zUY399YyD RONA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785961528; x=1786566328; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8Qc29af7044Ktsuo50pkEIXiXat2x/FckVqq57fZa/0=; b=lQXV+4hDPmFUa8DcPluZ/mddbqyoe9jLt33aSPUja4NnDER6KtmEGaQAHbBkVgqCpa bxLIETFsd638EuBUIxaYoy1asejkjg5BF+K/JCO0ufC+Onhg6El9cTgkm46pKqMTFQyT qtxIepuLwl9hlz4wcQWwjPFqNL4q1mNpp+MPz44biTSPaeeeJ1fS343zLJ4k5ABYW3Qj guvqW3ehAKWuNEf6TGL2b+g60Qla/kQ3FsNq/TEqYPtwIHhEbulJgq2hk9tp4KkvYviH sUUzJaaljkJtd37sLgqoWTcvT+QBtvWr6J7QxUt7/irBo6jiKXJ8SM1ADhuL7lp0W/kN lCTw== X-Forwarded-Encrypted: i=1; AHgh+RoZSnFpL7aI5UeLbJ3PkQ0biYRBTRuVGTFnwS1hezpZcS7Z4jQCOkf9rfLGhkXixNaXqiresQ5gMcI8moI=@vger.kernel.org X-Gm-Message-State: AOJu0YzTcF+lqSgyIRfVUVDbBT4yaVF5HwK+Lok6iAGKEllnzLVKp4bk xkak+fkIYfTJND2ry6KrgI9pRDbBOdaXOOsRqc3xARstMTaByZb2tkU7 X-Gm-Gg: AR+sD10MlJotN3t/03VQzQSFoO6dwkAtc9tEK9wHcMDGlIqhREsSIENXO8nuMmJWpM6 dB8HNjOkQ7d8Cn5eqo4+RoBLa8c15+5JCENCI6wXH2aEK8QHNi/WBkRDWoUQntyJjVEGyuo9CDF DcrYXJkUb4Fm7/tkycy4lun/EpbR+ZSPdSMsoNkuM5v9vosmTBoq5hTn1YcLwU5iyTSobwTKeHr 6Naiq8KfnV37x+5Vu/1GtNUkoZXt3ffOPOdB7UdCh29Cgcf/kx9jc+K32u1VT/B3QI5oU4cXaS/ iTBdjyZUmJDYUMOv9Z9J7HXvVxgtyi9QOfIzHKIB/nWm4HzvzkUaWBHtaqrbpcFR16t4ueKRMfn 2/pMI/Y0n5EJZKqFnMX/d7ayMQbRoyUTJ/wYDPgy6tnEApzcyx/kLB+SyTn/zIHhP3a2pCR7vbu kig7JwOJyoPHnIfLH5/UCx+UkeEjszjDEXHEvAM5cJ66WwIH/vF80G6KtwnNTj2mTBT2NyEm7Pc N5quGBo5Np7jO11B908AXNMe86nIzgoBnjA1gyt/2ilbw== X-Received: by 2002:a05:6820:4ccb:b0:6a1:40ad:cfac with SMTP id 006d021491bc7-6ae96c8c786mr5192892eaf.13.1785961527561; Wed, 05 Aug 2026 13:25:27 -0700 (PDT) Received: from ?IPV6:2607:fb91:ac9:d9bf:2112:37bc:94a6:a6db? ([2607:fb91:ac9:d9bf:2112:37bc:94a6:a6db]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4599e24dfc5sm3683651fac.7.2026.08.05.13.25.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Aug 2026 13:25:27 -0700 (PDT) Message-ID: Date: Wed, 5 Aug 2026 13:25:35 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] kprobes: Fix NULL pointer dereference in unregister_kretprobes() To: Luigi Rizzo , Masami Hiramatsu , Naveen N Rao , Luigi Rizzo , "David S . Miller" Cc: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260805161221.2428623-1-lrizzo@google.com> Content-Language: en-US From: JP Kobryn In-Reply-To: <20260805161221.2428623-1-lrizzo@google.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/5/2026 9:12 AM, Luigi Rizzo wrote: > In unregister_kretprobes(), rps[i]->rph can be NULL e.g. when called > after kretprobe failed registration. Under !CONFIG_KRETPROBE_ON_RETHOOK, > the unconditional access to rps[i]->rph->rp, causes a kernel panic due > to NULL pointer dereference. > > Add a NULL check for rps[i]->rph before invoking rcu_assign_pointer(). > > Fixes: d839a656d0f3 ("kprobes: consistent rcu api usage for kretprobe holder") The bug was not introduced in this commit. It goes further back to: d741bf41d7c7 ("kprobes: Remove kretprobe hash") > Signed-off-by: Luigi Rizzo > --- > kernel/kprobes.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/kernel/kprobes.c b/kernel/kprobes.c > index bfc89083daa93..5dd4786c455de 100644 > --- a/kernel/kprobes.c > +++ b/kernel/kprobes.c > @@ -2359,7 +2359,8 @@ void unregister_kretprobes(struct kretprobe **rps, int num) > #ifdef CONFIG_KRETPROBE_ON_RETHOOK > rethook_free(rps[i]->rh); > #else > - rcu_assign_pointer(rps[i]->rph->rp, NULL); > + if (rps[i]->rph) > + rcu_assign_pointer(rps[i]->rph->rp, NULL); > #endif > } >