netfilter: xtables: remove xt_owner v0 (6461caed) · Commits · e / devices / android_kernel_xiaomi_markw

include/linux/netfilter_ipv4/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ header-y += ipt_limit.h
		header-y += ipt_mac.h
		header-y += ipt_mark.h
		header-y += ipt_multiport.h
		header-y += ipt_owner.h
		header-y += ipt_physdev.h
		header-y += ipt_pkttype.h
		header-y += ipt_policy.h

include/linux/netfilter_ipv4/ipt_owner.h

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		#ifndef _IPT_OWNER_H
		#define _IPT_OWNER_H

		/* match and invert flags */
		#define IPT_OWNER_UID 0x01
		#define IPT_OWNER_GID 0x02
		#define IPT_OWNER_PID 0x04
		#define IPT_OWNER_SID 0x08
		#define IPT_OWNER_COMM 0x10

		struct ipt_owner_info {
		__kernel_uid32_t uid;
		__kernel_gid32_t gid;
		__kernel_pid_t pid;
		__kernel_pid_t sid;
		char comm[16];
		u_int8_t match, invert; /* flags */
		};

		#endif /_IPT_OWNER_H/

include/linux/netfilter_ipv6/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ header-y += ip6t_mark.h
		header-y += ip6t_mh.h
		header-y += ip6t_multiport.h
		header-y += ip6t_opts.h
		header-y += ip6t_owner.h
		header-y += ip6t_physdev.h
		header-y += ip6t_policy.h
		header-y += ip6t_rt.h

include/linux/netfilter_ipv6/ip6t_owner.h

deleted100644 → 0

+0 −18

Original line number	Diff line number	Diff line
		#ifndef _IP6T_OWNER_H
		#define _IP6T_OWNER_H

		/* match and invert flags */
		#define IP6T_OWNER_UID 0x01
		#define IP6T_OWNER_GID 0x02
		#define IP6T_OWNER_PID 0x04
		#define IP6T_OWNER_SID 0x08

		struct ip6t_owner_info {
		__kernel_uid32_t uid;
		__kernel_gid32_t gid;
		__kernel_pid_t pid;
		__kernel_pid_t sid;
		u_int8_t match, invert; /* flags */
		};

		#endif /_IPT_OWNER_H/

net/netfilter/xt_owner.c

+12 −118

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@
		* (C) 2000 Marc Boucher <marc@mbsi.ca>
		*
		* Copyright © CC Computer Consultants GmbH, 2007 - 2008
		* <jengelh@computergmbh.de>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		@@ -17,60 +16,6 @@
		#include <net/sock.h>
		#include <linux/netfilter/x_tables.h>
		#include <linux/netfilter/xt_owner.h>
		#include <linux/netfilter_ipv4/ipt_owner.h>
		#include <linux/netfilter_ipv6/ip6t_owner.h>

		static bool
		owner_mt_v0(const struct sk_buff skb, const struct xt_match_param par)
		{
		const struct ipt_owner_info *info = par->matchinfo;
		const struct file *filp;

		if (skb->sk == NULL \|\| skb->sk->sk_socket == NULL)
		return false;

		filp = skb->sk->sk_socket->file;
		if (filp == NULL)
		return false;

		if (info->match & IPT_OWNER_UID)
		if ((filp->f_cred->fsuid != info->uid) ^
		!!(info->invert & IPT_OWNER_UID))
		return false;

		if (info->match & IPT_OWNER_GID)
		if ((filp->f_cred->fsgid != info->gid) ^
		!!(info->invert & IPT_OWNER_GID))
		return false;

		return true;
		}

		static bool
		owner_mt6_v0(const struct sk_buff skb, const struct xt_match_param par)
		{
		const struct ip6t_owner_info *info = par->matchinfo;
		const struct file *filp;

		if (skb->sk == NULL \|\| skb->sk->sk_socket == NULL)
		return false;

		filp = skb->sk->sk_socket->file;
		if (filp == NULL)
		return false;

		if (info->match & IP6T_OWNER_UID)
		if ((filp->f_cred->fsuid != info->uid) ^
		!!(info->invert & IP6T_OWNER_UID))
		return false;

		if (info->match & IP6T_OWNER_GID)
		if ((filp->f_cred->fsgid != info->gid) ^
		!!(info->invert & IP6T_OWNER_GID))
		return false;

		return true;
		}

		static bool
		owner_mt(const struct sk_buff skb, const struct xt_match_param par)
		@@ -107,57 +52,7 @@ owner_mt(const struct sk_buff skb, const struct xt_match_param par)
		return true;
		}

		static bool owner_mt_check_v0(const struct xt_mtchk_param *par)
		{
		const struct ipt_owner_info *info = par->matchinfo;

		if (info->match & (IPT_OWNER_PID \| IPT_OWNER_SID \| IPT_OWNER_COMM)) {
		printk(KERN_WARNING KBUILD_MODNAME
		": PID, SID and command matching is not "
		"supported anymore\n");
		return false;
		}

		return true;
		}

		static bool owner_mt6_check_v0(const struct xt_mtchk_param *par)
		{
		const struct ip6t_owner_info *info = par->matchinfo;

		if (info->match & (IP6T_OWNER_PID \| IP6T_OWNER_SID)) {
		printk(KERN_WARNING KBUILD_MODNAME
		": PID and SID matching is not supported anymore\n");
		return false;
		}

		return true;
		}

		static struct xt_match owner_mt_reg[] __read_mostly = {
		{
		.name = "owner",
		.revision = 0,
		.family = NFPROTO_IPV4,
		.match = owner_mt_v0,
		.matchsize = sizeof(struct ipt_owner_info),
		.checkentry = owner_mt_check_v0,
		.hooks = (1 << NF_INET_LOCAL_OUT) \|
		(1 << NF_INET_POST_ROUTING),
		.me = THIS_MODULE,
		},
		{
		.name = "owner",
		.revision = 0,
		.family = NFPROTO_IPV6,
		.match = owner_mt6_v0,
		.matchsize = sizeof(struct ip6t_owner_info),
		.checkentry = owner_mt6_check_v0,
		.hooks = (1 << NF_INET_LOCAL_OUT) \|
		(1 << NF_INET_POST_ROUTING),
		.me = THIS_MODULE,
		},
		{
		static struct xt_match owner_mt_reg __read_mostly = {
		.name = "owner",
		.revision = 1,
		.family = NFPROTO_UNSPEC,
		@@ -166,22 +61,21 @@ static struct xt_match owner_mt_reg[] __read_mostly = {
		.hooks = (1 << NF_INET_LOCAL_OUT) \|
		(1 << NF_INET_POST_ROUTING),
		.me = THIS_MODULE,
		},
		};

		static int __init owner_mt_init(void)
		{
		return xt_register_matches(owner_mt_reg, ARRAY_SIZE(owner_mt_reg));
		return xt_register_match(&owner_mt_reg);
		}

		static void __exit owner_mt_exit(void)
		{
		xt_unregister_matches(owner_mt_reg, ARRAY_SIZE(owner_mt_reg));
		xt_unregister_match(&owner_mt_reg);
		}

		module_init(owner_mt_init);
		module_exit(owner_mt_exit);
		MODULE_AUTHOR("Jan Engelhardt <jengelh@computergmbh.de>");
		MODULE_AUTHOR("Jan Engelhardt <jengelh@medozas.de>");
		MODULE_DESCRIPTION("Xtables: socket owner matching");
		MODULE_LICENSE("GPL");
		MODULE_ALIAS("ipt_owner");