From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Fastabend Subject: [bpf-next v2 0/2] Fix kcm + sockmap by checking psock type Date: Wed, 17 Oct 2018 22:20:02 -0700 Message-ID: <1539840004-26433-1-git-send-email-john.fastabend@gmail.com> Cc: john.fastabend@gmail.com, netdev@vger.kernel.org, eric.dumazet@gmail.com To: ast@kernel.org, daniel@iogearbox.net Return-path: Received: from mail-it1-f196.google.com ([209.85.166.196]:40599 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727331AbeJRNT2 (ORCPT ); Thu, 18 Oct 2018 09:19:28 -0400 Received: by mail-it1-f196.google.com with SMTP id i191-v6so5498024iti.5 for ; Wed, 17 Oct 2018 22:20:16 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: We check if the sk_user_data (the psock in skmsg) is in fact a sockmap type to late, after we read the refcnt which is an error. This series moves the check up before reading refcnt and also adds a test to test_maps to test trying to add a KCM socket into a sockmap. While reviewig this code I also found an issue with KCM and kTLS where each uses sk_data_ready hooks and associated stream parser breaking expectations in kcm, ktls or both. But that fix will need to go to net. Thanks to Eric for reporting. v2: Fix up file +/- my scripts lost track of them John Fastabend (2): bpf: skmsg, fix psock create on existing kcm/tls port bpf: test_maps add a test to catch kcm + sockmap include/linux/skmsg.h | 25 +++++++++--- net/core/sock_map.c | 11 +++--- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/sockmap_kcm.c | 14 +++++++ tools/testing/selftests/bpf/test_maps.c | 64 ++++++++++++++++++++++++++++++- 5 files changed, 103 insertions(+), 13 deletions(-) create mode 100644 tools/testing/selftests/bpf/sockmap_kcm.c -- 1.9.1