{"id":805999,"url":"http://patchwork.ozlabs.org/api/1.2/patches/805999/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1503687941-626-9-git-send-email-dsahern@gmail.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1503687941-626-9-git-send-email-dsahern@gmail.com>","list_archive_url":null,"date":"2017-08-25T19:05:41","name":"[v2,net-next,8/8] samples/bpf: Update cgroup socket examples to use uid gid helper","commit_ref":null,"pull_url":null,"state":"deferred","archived":true,"hash":"f81670df062694598b2e5cc44b578ad4b2124cf5","submitter":{"id":6918,"url":"http://patchwork.ozlabs.org/api/1.2/people/6918/?format=json","name":"David Ahern","email":"dsahern@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1503687941-626-9-git-send-email-dsahern@gmail.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/805999/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/805999/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"lkrSCsU/\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xf9cN5VKYz9t1m\n\tfor ;\n\tSat, 26 Aug 2017 05:06:12 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1758147AbdHYTGF (ORCPT );\n\tFri, 25 Aug 2017 15:06:05 -0400","from mail-pg0-f66.google.com ([74.125.83.66]:35877 \"EHLO\n\tmail-pg0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1756602AbdHYTF7 (ORCPT\n\t); Fri, 25 Aug 2017 15:05:59 -0400","by mail-pg0-f66.google.com with SMTP id 83so890707pgb.3\n\tfor ; Fri, 25 Aug 2017 12:05:58 -0700 (PDT)","from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com.\n\t[216.129.126.126]) by smtp.googlemail.com with ESMTPSA id\n\t16sm16642137pfn.188.2017.08.25.12.05.57\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 25 Aug 2017 12:05:57 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=0ogPYy+QZ7UcUXXoLvRgs0QYQaZytYgHO8b+ojQb5gk=;\n\tb=lkrSCsU/koFzu8ojy7j90FzOT/vtPdu/DLmbLbUM6s6QZ2jXJ3JBQNIZOiRm+d3H7R\n\tjxFCTN5FNiFb8RzOLgYp5pHhN9pXcCRQNNWdJbDT9Il2eUIC3mVhs0l86ETvzpQnET76\n\tIpLqhn7k6UMktUN/H6y9NY+b/7hysZ5vU/ic4T7wqLBPM5UNeBVeGn5eapw31jdLbLGt\n\tV2gXMkuqyB4GS5xK0UvdAmx09wXYEPf/VtA3dZNS8TMjxOWHcV+oz/zqtTOG/+G8H9c+\n\ts+D5Jl60zm6GMxMdLsQCyRYaFJVTvcn+jtdO7f9ds2M8fqk/ycit0cGQTcw6G3RYr500\n\tNGxA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=0ogPYy+QZ7UcUXXoLvRgs0QYQaZytYgHO8b+ojQb5gk=;\n\tb=b0t8Jzb7X9juXem0qZPK9R/G8AOekNtnt4KYEAAlmM5y82YU+2enE8KYz/4EpK/cx4\n\tsUoge/287ISvZ94zeWzZkskncdToQftksLcOj+Ko3SEVhIGOsKOlmQ9Mq4i8WJ3cRmcB\n\tY3fdyn2vuPt1bYfDknyG/d8w80r1k4w/BwdQwS91PpCgFMNglUKn2CDDiqB5mL92jp/R\n\txrhSzGeJQ7adPNIwhwWPKY1Jnsj/E1onYq6S6IcJ1lcQdvMemAoyxJ9SqzWclPhcSP75\n\tfNwqKyQTsAQeteDf6hZJZuNNDQGe0fjaTOjSMasYANpmCjq5zi3HCEuNviNjeLS4/qAP\n\tuBhg==","X-Gm-Message-State":"AHYfb5ir7oasNSGfbgrUVtYWXj5cFmAmMe267m8siZAxhbbc6BXPk3DS\n\t7Q1cbfy9gyMUMGjm","X-Received":"by 10.99.4.143 with SMTP id 137mr10573250pge.62.1503687958444;\n\tFri, 25 Aug 2017 12:05:58 -0700 (PDT)","From":"David Ahern ","To":"netdev@vger.kernel.org, daniel@iogearbox.net, ast@kernel.org,\n\ttj@kernel.org, davem@davemloft.net","Cc":"David Ahern ","Subject":"[PATCH v2 net-next 8/8] samples/bpf: Update cgroup socket examples\n\tto use uid gid helper","Date":"Fri, 25 Aug 2017 12:05:41 -0700","Message-Id":"<1503687941-626-9-git-send-email-dsahern@gmail.com>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1503687941-626-1-git-send-email-dsahern@gmail.com>","References":"<1503687941-626-1-git-send-email-dsahern@gmail.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Signed-off-by: David Ahern \n---\n samples/bpf/sock_flags_kern.c | 5 +++++\n samples/bpf/test_cgrp2_sock.c | 12 +++++++++++-\n 2 files changed, 16 insertions(+), 1 deletion(-)","diff":"diff --git a/samples/bpf/sock_flags_kern.c b/samples/bpf/sock_flags_kern.c\nindex 533dd11a6baa..05dcdf8a4baa 100644\n--- a/samples/bpf/sock_flags_kern.c\n+++ b/samples/bpf/sock_flags_kern.c\n@@ -9,8 +9,13 @@ SEC(\"cgroup/sock1\")\n int bpf_prog1(struct bpf_sock *sk)\n {\n \tchar fmt[] = \"socket: family %d type %d protocol %d\\n\";\n+\tchar fmt2[] = \"socket: uid %u gid %u\\n\";\n+\t__u64 gid_uid = bpf_get_current_uid_gid();\n+\t__u32 uid = gid_uid & 0xffffffff;\n+\t__u32 gid = gid_uid >> 32;\n \n \tbpf_trace_printk(fmt, sizeof(fmt), sk->family, sk->type, sk->protocol);\n+\tbpf_trace_printk(fmt2, sizeof(fmt2), uid, gid);\n \n \t/* block PF_INET6, SOCK_RAW, IPPROTO_ICMPV6 sockets\n \t * ie., make ping6 fail\ndiff --git a/samples/bpf/test_cgrp2_sock.c b/samples/bpf/test_cgrp2_sock.c\nindex eabf530a5223..e9eeaaf52219 100644\n--- a/samples/bpf/test_cgrp2_sock.c\n+++ b/samples/bpf/test_cgrp2_sock.c\n@@ -46,8 +46,18 @@ static int prog_load(__u32 idx, __u32 mark, __u32 prio)\n \n \t/* set mark on socket */\n \tstruct bpf_insn prog_mark[] = {\n-\t\tBPF_MOV64_REG(BPF_REG_1, BPF_REG_6),\n+\t\t/* get uid of process */\n+\t\tBPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,\n+\t\t\t BPF_FUNC_get_current_uid_gid),\n+\t\tBPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xffffffff),\n+\n+\t\t/* if uid is 0, use given mark, else use the uid as the mark */\n+\t\tBPF_MOV64_REG(BPF_REG_3, BPF_REG_0),\n+\t\tBPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1),\n \t\tBPF_MOV64_IMM(BPF_REG_3, mark),\n+\n+\t\t/* set the mark on the new socket */\n+\t\tBPF_MOV64_REG(BPF_REG_1, BPF_REG_6),\n \t\tBPF_MOV64_IMM(BPF_REG_2, offsetof(struct bpf_sock, mark)),\n \t\tBPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, offsetof(struct bpf_sock, mark)),\n \t};\n","prefixes":["v2","net-next","8/8"]}