From patchwork Mon May 4 17:21:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 1282902 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mxJr9oeC; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49G8lg5fvGz9sSW for ; Tue, 5 May 2020 03:21:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729996AbgEDRVS (ORCPT ); Mon, 4 May 2020 13:21:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729777AbgEDRVS (ORCPT ); Mon, 4 May 2020 13:21:18 -0400 Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DFD0C061A0E; Mon, 4 May 2020 10:21:18 -0700 (PDT) Received: by mail-il1-x144.google.com with SMTP id x2so12000098ilp.13; Mon, 04 May 2020 10:21:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:date:message-id:user-agent:mime-version :content-transfer-encoding; bh=tUSEwSXh8XVl3QH0MEWVOPc/xrRd2sKV2YwFOw1eFQI=; b=mxJr9oeCM07QvxB9jzZYDAQZMQHsP2epgm1aAdQ06XoWjOHr7ZmKsZSve6wcY1YXIl +MF8GrcLv8fRSlpNk8R6Yks8XiH6jMIF8SaScT9seKm43jESFANbLLbzrHJVpUZqCXTt HlTXNXyz6wMHhL1FGBUZdfsJrAU07CM+pc2h57L/rUthOdV7OHI16+47T991ssbnMg2a DyQ23DNSpuqIHHM9kxidugLjrJeSdtzvwor1W0O1eIm7BTy37juCP5RVqquJswWHiTjz rZIEC2oMQa3jbp1EX5e1nkDmRn7363STvNdsAy9de/2NFx2lPwCJkijKgDT9gUflNic9 DGhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:user-agent :mime-version:content-transfer-encoding; bh=tUSEwSXh8XVl3QH0MEWVOPc/xrRd2sKV2YwFOw1eFQI=; b=nvbQc95EZ2BIk8/h4Xbek/uNCl4k2GJP9aO/3TDZ6AgnoV1/QLWTPF4rfomNTqGw+Z eAJMCCqyO9FhfzmuSaIGXqJe2DiM7atW+/oC327eJQ66sWKQyhFnDHiKlYwTStDtxz3X v+iwDnk61bnEQzXIToDXmUhwZTttmWQ8VJ8uh6T2dZae8j70viIsRD/3o4KTaFzpLBEt vwfOgxC93BGdI8VFzR6akjgEnUPW6ZKWK3tLcx2DROVNJVpqg0nVT/8a0Aj2DKkHuOcr 1cv6e/7dcwsMXY/+Dz5vh7pQAgeCa+38abPBhPM4vWCoTkrIKOpJKx10I7wjaRAUkeNO 4NeQ== X-Gm-Message-State: AGi0PubefSp9o14q3/0DPyaijVsiRhM01prZY1YdI935K/+siqv3IsPJ KHtw8tGEi/BhGCAaxQTvKSU= X-Google-Smtp-Source: APiQypIp64ebifabNDFE8DeWtM6rRqtw7pEc+SPcJjgF+LKnDmtPAjSOcoAiBL4LDueMSEZp1NeigA== X-Received: by 2002:a92:8693:: with SMTP id l19mr18025696ilh.48.1588612877654; Mon, 04 May 2020 10:21:17 -0700 (PDT) Received: from [127.0.1.1] ([184.63.162.180]) by smtp.gmail.com with ESMTPSA id m14sm5471742ilq.68.2020.05.04.10.21.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 May 2020 10:21:16 -0700 (PDT) Subject: [PATCH 0/2] sockmap, fix for some error paths with helpers From: John Fastabend To: jakub@cloudflare.com, daniel@iogearbox.net Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, john.fastabend@gmail.com, ast@kernel.org Date: Mon, 04 May 2020 10:21:01 -0700 Message-ID: <158861271707.14306.15853815339036099229.stgit@john-Precision-5820-Tower> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In these two cases sk_msg layout was getting confused with some helper sequences. I found these while cleaning up test_sockmap to do a better job covering the different scenarios. Those patches will go to bpf-next and include tests that cover these two cases. Reviewed-by: Jakub Sitnicki --- John Fastabend (2): bpf: sockmap, msg_pop_data can incorrecty set an sge length bpf: sockmap, bpf_tcp_ingress needs to subtract bytes from sg.size include/linux/skmsg.h | 1 + net/core/filter.c | 2 +- net/ipv4/tcp_bpf.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) -- Signature