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 B5D237764E; Tue, 16 Jan 2024 19:47:03 +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=1705434423; cv=none; b=uf7dc4lMuStYJYDm0QnkJhKeMyVw3R71+MbWkcEmlm/2uwd/BRvNxjEf4umx/HwwOnKefacN6mQkMioFUJqlm+xMYKN91SECVTdT0roUJpnwv0KY0dJIt+kBNfVof0uQE4/NJUghHR6u+2m9aFiNkvJf+bpoU54T2tOwed4zRww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434423; c=relaxed/simple; bh=XwWy4btrdrFDaQdryPSsdCI1nnvmIWTXvP6El7XQBd4=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=ZQU6ECRnLAKlxU12kKzv87lGdOiesvj0dX4/hmn+0DFV6JwkelWfuqQrhJF7I45XqaKkyzjJgd7fQ3McXbekpMVGRwNW8+e/Wj0qZbezzVNbkjSthoP+6waQ5jiEe4kQHVqcst0x81C3gpbY7etFRZGh3EjB2CWqk+8xuRzhcsA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aPgKkpRL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aPgKkpRL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EAC96C433F1; Tue, 16 Jan 2024 19:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434423; bh=XwWy4btrdrFDaQdryPSsdCI1nnvmIWTXvP6El7XQBd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aPgKkpRL4FF62p42D0YP0Hs/OSvxl25yzZ9x2xEhGtnVA6xusJM4TCGAxpaRRNt3O Ep2Aji5ek5e67EV4RNY3njmoTVooH4q+nnBhAJbdXQLukqrcN23VfeCqzoAA3Sudvo VnSaOVQIHenQLtIDQqN/MSBtajaFaGl1OJZQMceH8/0xy+kEgBQav1++/nwyuBgDQf HAF3zHnsCZBRXQ8Y+PvW+Yt/J132RZFmGTZW7wGd0gTXWm32o3JPTy1zUlPaW30L3O Cb7cbCiMwSBvoSe2Dh4NnPzh0NsDi1iwyZsxS/MzmnUzlG5eROZSJ4gnxgpH39XvZK ZkPg/fQqb+iBA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mina Almasry , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, dhowells@redhat.com, syoshida@redhat.com, kuniyu@amazon.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.7 106/108] net: kcm: fix direct access to bv_len Date: Tue, 16 Jan 2024 14:40:12 -0500 Message-ID: <20240116194225.250921-106-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116194225.250921-1-sashal@kernel.org> References: <20240116194225.250921-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7 Content-Transfer-Encoding: 8bit From: Mina Almasry [ Upstream commit b15a4cfe100b9acd097d3ae7052448bd1cdc2a3b ] Minor fix for kcm: code wanting to access the fields inside an skb frag should use the skb_frag_*() helpers, instead of accessing the fields directly. Signed-off-by: Mina Almasry Link: https://lore.kernel.org/r/20240102205959.794513-1-almasrymina@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/kcm/kcmsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 65d1f6755f98..1184d40167b8 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -634,7 +634,7 @@ static int kcm_write_msgs(struct kcm_sock *kcm) msize = 0; for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) - msize += skb_shinfo(skb)->frags[i].bv_len; + msize += skb_frag_size(&skb_shinfo(skb)->frags[i]); iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, skb_shinfo(skb)->frags, skb_shinfo(skb)->nr_frags, -- 2.43.0