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 681A33E316C; Tue, 31 Mar 2026 16:25:46 +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=1774974346; cv=none; b=tFVkEeHwT9/yrrQ8wUDl59i2CVNqzLv1WLuNSWRqZSLNd/PnBSo/SI/bmFP6o4wRE2oxFocKJueb1JMTycHWS2hfJIBMm/6S8uOk87Cs83izvRY0ZRmEC18y46wnNUnroAah2E+nUvWf3olxtsJ+i8Z39lJpBYJ9bjuYq+GgebU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774974346; c=relaxed/simple; bh=RV7bzO3TzajM6xhosJ165UkA1Pil0OWbkijFpTBGQ84=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d8gPMP6Auhu+YexgSvCr1g/iLyzBu0vTLQ7FtTPcKRokNXA8u2u2Um14XVsLqRkrA0539YO6uj2GOHxVczkAPnMFPgQklnNaPt2Ijk5FYr0GToUANvrF8RPwTwYzBQR6z28vlpAWFqRtejZMSaLcLuv81O9ooo2MCPaFRdpPR+0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JfbOh3ch; 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="JfbOh3ch" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA9B2C19423; Tue, 31 Mar 2026 16:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774974346; bh=RV7bzO3TzajM6xhosJ165UkA1Pil0OWbkijFpTBGQ84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JfbOh3chxJZH9aBTKolMbRNZtw+2oBG38LFE0shbc4qTuZoAV2VUlXcFEpcj3vkim ZZ7e9kpfRLBftJ70NKchixaWV0jMIuSCrBFjl49cKoTTuNXzHb1n0rlsZhHFElc5Yg b3oCpfFsQS10zOyVBufDSQzb78tlWp7oAFE4okuo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiri Pirko , Sabrina Dubroca , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 050/175] rtnetlink: count IFLA_INFO_SLAVE_KIND in if_nlmsg_size Date: Tue, 31 Mar 2026 18:20:34 +0200 Message-ID: <20260331161731.624569849@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331161729.779738837@linuxfoundation.org> References: <20260331161729.779738837@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sabrina Dubroca [ Upstream commit ee00a12593ffb69db4dd1a1c00ecb0253376874a ] rtnl_link_get_slave_info_data_size counts IFLA_INFO_SLAVE_DATA, but rtnl_link_slave_info_fill adds both IFLA_INFO_SLAVE_DATA and IFLA_INFO_SLAVE_KIND. Fixes: ba7d49b1f0f8 ("rtnetlink: provide api for getting and setting slave info") Reviewed-by: Jiri Pirko Signed-off-by: Sabrina Dubroca Link: https://patch.msgid.link/049843b532e23cde7ddba263c0bbe35ba6f0d26d.1773919462.git.sd@queasysnail.net Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/rtnetlink.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 1613563132035..acb3a8e19743c 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -571,11 +571,14 @@ static size_t rtnl_link_get_slave_info_data_size(const struct net_device *dev) goto out; ops = master_dev->rtnl_link_ops; - if (!ops || !ops->get_slave_size) + if (!ops) + goto out; + size += nla_total_size(strlen(ops->kind) + 1); /* IFLA_INFO_SLAVE_KIND */ + if (!ops->get_slave_size) goto out; /* IFLA_INFO_SLAVE_DATA + nested data */ - size = nla_total_size(sizeof(struct nlattr)) + - ops->get_slave_size(master_dev, dev); + size += nla_total_size(sizeof(struct nlattr)) + + ops->get_slave_size(master_dev, dev); out: rcu_read_unlock(); -- 2.51.0