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 553EB34AB06; Wed, 8 Apr 2026 18:51:49 +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=1775674309; cv=none; b=uXyss0iEmhzHpG+clcEK+0GG+0sfFsieWZjJz1si8IUnTsfdVIUR1kEglqiMrizPZfFOUgiyetWaBaZgelfA+ogG/BwuyjMR9OU3WAh0QZ5/KVbvxVraNL96Ys/SZByPFEq+ELcFE4WBdOt/DL2pdRgOYAi2NTmYb+Z5euzwG5c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775674309; c=relaxed/simple; bh=fu5jvsuRHwVxaU7c5Chzn3MSdwOJIPfw19jN+fcD5+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uLHRkdwbcRKfWg5hPj3eeVgc3YsDqJJB93zt98uOqGqocl/rL7uBN/AGIQw6UXdE0S2rtt95QU9RzhbcypI7Mola9q3LjCNer8phbJU5SbPDsUEyf4XfKsVixEkp3+4XJ8Vk+ynS3d48xmM0Kmn0oUBiRwhXxlUa3OuvzTDHxLs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DfVykaxK; 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="DfVykaxK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEE4AC19421; Wed, 8 Apr 2026 18:51:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775674309; bh=fu5jvsuRHwVxaU7c5Chzn3MSdwOJIPfw19jN+fcD5+U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DfVykaxKTInGl3bYngIJVdxq6LXdGNQoT8pWzlvpmzgj2gtynAaSX1oqhbomJVGr1 twZ9Map0ZxnC1wxRjvxzDGPqVADbXOO+xzBC7W1m7gEMw6DBMB4hD6SLjKlnP+ZO1P 1sZgWYgAlHTZYzlxys8TC4sqqYAMVO+lIFVW1Huw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yochai Eisenrich , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.19 048/311] net: ipv6: ndisc: fix ndisc_ra_useropt to initialize nduseropt_padX fields to zero to prevent an info-leak Date: Wed, 8 Apr 2026 20:00:48 +0200 Message-ID: <20260408175941.209419020@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175939.393281918@linuxfoundation.org> References: <20260408175939.393281918@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yochai Eisenrich [ Upstream commit ae05340ccaa9d347fe85415609e075545bec589f ] When processing Router Advertisements with user options the kernel builds an RTM_NEWNDUSEROPT netlink message. The nduseroptmsg struct has three padding fields that are never zeroed and can leak kernel data The fix is simple, just zeroes the padding fields. Fixes: 31910575a9de ("[IPv6]: Export userland ND options through netlink (RDNSS support)") Signed-off-by: Yochai Eisenrich Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260324224925.2437775-1-echelonh@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv6/ndisc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index f6a5d8c73af97..186e60c792145 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1209,6 +1209,9 @@ static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt) ndmsg->nduseropt_icmp_type = icmp6h->icmp6_type; ndmsg->nduseropt_icmp_code = icmp6h->icmp6_code; ndmsg->nduseropt_opts_len = opt->nd_opt_len << 3; + ndmsg->nduseropt_pad1 = 0; + ndmsg->nduseropt_pad2 = 0; + ndmsg->nduseropt_pad3 = 0; memcpy(ndmsg + 1, opt, opt->nd_opt_len << 3); -- 2.53.0