From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E6D3C28CC6 for ; Tue, 4 Jun 2019 23:32:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1DB7206B8 for ; Tue, 4 Jun 2019 23:32:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559691161; bh=mIl1qkLw6ixFkw961ZXi8NjSN8yh49bdoYo0oKYcreE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C0thf2t0/wg5TGVATPcounNQAAAK3YW7+s52vPvfdyMxG29XexPdE8ephL9HVI5yj txtJU1/m1b882xshrRanmzNmDjXqO8SVRnc4sGFegUgCsYRQfGmlzLuBnIlO/3W3FL kpOsYm0LnecRphNEdMKhIPyFzfIG+hK4CDrzhstA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726881AbfFDXWj (ORCPT ); Tue, 4 Jun 2019 19:22:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:60980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726876AbfFDXWi (ORCPT ); Tue, 4 Jun 2019 19:22:38 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 65B8520859; Tue, 4 Jun 2019 23:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559690558; bh=mIl1qkLw6ixFkw961ZXi8NjSN8yh49bdoYo0oKYcreE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=og9rgRypUkY8bkK+WmJpvzoZqJa4It4V+Z2MD1UxPMvhds255BdAkFTzD1PomUgIG M/hS7+aMkkVFM1W13sLNv7t8FIpAe73ADPnRMDNdMTsiG8WcXGd6DvQrgF+Cj6B2zx BHlf2QQCVYi2rP+xVK3Z6kTeI4vE1JGVJXTLbZpU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Fastabend , Daniel Borkmann , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 14/60] bpf: sockmap fix msg->sg.size account on ingress skb Date: Tue, 4 Jun 2019 19:21:24 -0400 Message-Id: <20190604232212.6753-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190604232212.6753-1-sashal@kernel.org> References: <20190604232212.6753-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: John Fastabend [ Upstream commit cabede8b4f2b746232aa25730a0b752de1cb82ca ] When converting a skb to msg->sg we forget to set the size after the latest ktls/tls code conversion. This patch can be reached by doing a redir into ingress path from BPF skb sock recv hook. Then trying to read the size fails. Fix this by setting the size. Fixes: 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface") Signed-off-by: John Fastabend Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- net/core/skmsg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 49d1efa329d7..93bffaad2135 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -411,6 +411,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb) sk_mem_charge(sk, skb->len); copied = skb->len; msg->sg.start = 0; + msg->sg.size = copied; msg->sg.end = num_sge == MAX_MSG_FRAGS ? 0 : num_sge; msg->skb = skb; -- 2.20.1