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=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 3A8C3C31E5B for ; Mon, 17 Jun 2019 21:37:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F16982063F for ; Mon, 17 Jun 2019 21:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560807433; bh=7ZbpBeuw0/PJSwmrd6GiDblX1MVXsc6Yng5kAfWeLn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=prqP4lRWAHDMSl0TfUZpFNoE2TNSKDdi9UToPnc6ELyyOk4Syfa5HcuAGiheLbFDs 2cka1THbgoCqsXFk9iV7Or6opvDwX2UkggLqsr0vUzwj4qKUpWlCU5NwqVN0ihc44M jcc/syHCfRq41aJwvn3PjS8wkFgAk3ggMc/pTQt0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728339AbfFQVUd (ORCPT ); Mon, 17 Jun 2019 17:20:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:44794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729141AbfFQVUd (ORCPT ); Mon, 17 Jun 2019 17:20:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E04252089E; Mon, 17 Jun 2019 21:20:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806432; bh=7ZbpBeuw0/PJSwmrd6GiDblX1MVXsc6Yng5kAfWeLn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yzfzBiEDVpnjqfU10BMdPn7pFYic2vwVt/saJ/UcTbWseC/xlbl8NEAL9rA9jEpGT STiWLwM8zSqOdPFdmnYl4qcf0b09q7bZKx9MVHKafSVhsYlMcpdLnNlCRq00zke1nz Zu4few/efmjPZMvpPdw2cPQ5VKfaZyFNo08fb1Cc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Fastabend , Daniel Borkmann , Sasha Levin Subject: [PATCH 5.1 051/115] bpf: sockmap fix msg->sg.size account on ingress skb Date: Mon, 17 Jun 2019 23:09:11 +0200 Message-Id: <20190617210803.071458219@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210759.929316339@linuxfoundation.org> References: <20190617210759.929316339@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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