From patchwork Thu Sep 19 20:18:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 276054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8EF802C00CB for ; Fri, 20 Sep 2013 06:19:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752734Ab3ISUTE (ORCPT ); Thu, 19 Sep 2013 16:19:04 -0400 Received: from mail.us.es ([193.147.175.20]:37707 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753335Ab3ISUTC (ORCPT ); Thu, 19 Sep 2013 16:19:02 -0400 Received: (qmail 3038 invoked from network); 19 Sep 2013 22:19:01 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 19 Sep 2013 22:19:01 +0200 Received: (qmail 6857 invoked by uid 507); 19 Sep 2013 20:19:00 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.8/17872. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-99.8/7.5):. Processed in 2.473663 secs); 19 Sep 2013 20:19:00 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-99.8 required=7.5 tests=BAYES_50,RCVD_IN_PBL, RCVD_IN_RP_RNBL, RCVD_IN_SORBS_DUL, RDNS_DYNAMIC, SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS12715 188.76.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 19 Sep 2013 20:18:58 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/410/antivirus2); Thu, 19 Sep 2013 22:18:58 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/410/antivirus2) Received: (qmail 1740 invoked from network); 19 Sep 2013 22:18:58 +0200 Received: from 23.149.76.188.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@188.76.149.23) by mail.us.es with SMTP; 19 Sep 2013 22:18:58 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH -nftables 2/3] netfilter: nf_tables: nft_meta: fix socket uid, gid handling Date: Thu, 19 Sep 2013 22:18:52 +0200 Message-Id: <1379621933-6064-2-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1379621933-6064-1-git-send-email-pablo@netfilter.org> References: <1379621933-6064-1-git-send-email-pablo@netfilter.org> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org net/netfilter/nft_meta.c: In function ‘nft_meta_eval’: net/netfilter/nft_meta.c:82:17: error: incompatible types when assigning to type ‘u32’ from type ‘kuid_t’ net/netfilter/nft_meta.c:88:17: error: incompatible types when assigning to type ‘u32’ from type ‘kgid_t’ Reported-by: Bjørnar Ness Signed-off-by: Pablo Neira Ayuso --- net/netfilter/nft_meta.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c index 84256bc..8c28220 100644 --- a/net/netfilter/nft_meta.c +++ b/net/netfilter/nft_meta.c @@ -16,6 +16,7 @@ #include #include #include +#include /* for TCP_TIME_WAIT */ #include struct nft_meta { @@ -76,16 +77,35 @@ static void nft_meta_eval(const struct nft_expr *expr, *(u16 *)dest->data = out->type; break; case NFT_META_SKUID: - if (skb->sk == NULL || skb->sk->sk_socket == NULL || - skb->sk->sk_socket->file == NULL) + if (skb->sk == NULL || skb->sk->sk_state == TCP_TIME_WAIT) goto err; - dest->data[0] = skb->sk->sk_socket->file->f_cred->fsuid; + + read_lock_bh(&skb->sk->sk_callback_lock); + if (skb->sk->sk_socket == NULL || + skb->sk->sk_socket->file == NULL) { + read_unlock_bh(&skb->sk->sk_callback_lock); + goto err; + } + + dest->data[0] = + from_kuid_munged(&init_user_ns, + skb->sk->sk_socket->file->f_cred->fsuid); + read_unlock_bh(&skb->sk->sk_callback_lock); break; case NFT_META_SKGID: - if (skb->sk == NULL || skb->sk->sk_socket == NULL || - skb->sk->sk_socket->file == NULL) + if (skb->sk == NULL || skb->sk->sk_state == TCP_TIME_WAIT) + goto err; + + read_lock_bh(&skb->sk->sk_callback_lock); + if (skb->sk->sk_socket == NULL || + skb->sk->sk_socket->file == NULL) { + read_unlock_bh(&skb->sk->sk_callback_lock); goto err; - dest->data[0] = skb->sk->sk_socket->file->f_cred->fsgid; + } + dest->data[0] = + from_kgid_munged(&init_user_ns, + skb->sk->sk_socket->file->f_cred->fsgid); + read_unlock_bh(&skb->sk->sk_callback_lock); break; #ifdef CONFIG_NET_CLS_ROUTE case NFT_META_RTCLASSID: {