avr/qmk/firmware - [no description]

	Commit message (Expand)	Author	Age	Files	Lines
*	Add OPT aliases for ALT keycodes and macros (#8714)	Konstantin Đorđević	2020-04-12	1	-2/+2
*	Remove obsolete note about media keys in MacOS (#6631)	Steve Purcell	2019-10-30	1	-3/+3
*	Backslash-escape pipe character in keycode lists (#7157)	fauxpark	2019-10-26	1	-22/+22
*	Add new brightness aliases to keycodes_basic.md	fauxpark	2019-01-17	1	-50/+50
*	Add standard definitions for ALGR and KC_ALGR (#4389)	Konstantin Đorđević	2018-12-12	1	-1/+1
*	Add Extrakey support for Brightness up/down (#4477)	Giuseppe Rota	2018-11-28	1	-0/+2
*	Docs: Fix descriptions of KC_INT1 and KC_INT3	KOBAYASHI Daisuke	2018-11-13	1	-2/+2
*	Fix more broken links to the HID spec	Christoffer Holmberg	2018-10-17	1	-1/+1
*	More improvements to keycode docs (#3567)	fauxpark	2018-08-04	1	-137/+160
*	Clean up SEND_STRING keycodes and add media keys (#3214)	fauxpark	2018-06-28	1	-0/+1
*	Add CMD and WIN aliases for KC_GUI, GUI(kc), GUI_T(kc), etc.	fauxpark	2018-03-16	1	-15/+15
*	Format keycode tables	fauxpark	2017-12-09	1	-172/+210
*	Convert all headings to Title Case	fauxpark	2017-12-09	1	-1/+1
*	platform descriptions to match master keycodes.md documentation	surlyjake	2017-09-25	1	-6/+6
*	Doc updates from going through every file	skullY	2017-08-16	1	-0/+192

--- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -17,6 +17,7 @@ #include <linux/percpu.h> #include <linux/netdevice.h> #include <linux/security.h> +#include <linux/inet.h> #include <net/net_namespace.h> #ifdef CONFIG_SYSCTL #include <linux/sysctl.h> @@ -288,10 +289,66 @@ static int ct_open(struct inode *inode, sizeof(struct ct_iter_state)); } +struct kill_request { + u16 family; + union nf_inet_addr addr; +}; + +static int kill_matching(struct nf_conn *i, void *data) +{ + struct kill_request *kr = data; + struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple; + struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple; + + if (!kr->family) + return 1; + + if (t1->src.l3num != kr->family) + return 0; + + return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) || + nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) || + nf_inet_addr_cmp(&kr->addr, &t2->src.u3) || + nf_inet_addr_cmp(&kr->addr, &t2->dst.u3)); +} + +static ssize_t ct_file_write(struct file *file, const char __user *buf, + size_t count, loff_t *ppos) +{ + struct seq_file *seq = file->private_data; + struct net *net = seq_file_net(seq); + struct kill_request kr = { }; + char req[INET6_ADDRSTRLEN] = { }; + + if (count == 0) + return 0; + + if (count >= INET6_ADDRSTRLEN) + count = INET6_ADDRSTRLEN - 1; + + if (copy_from_user(req, buf, count)) + return -EFAULT; + + if (strnchr(req, count, ':')) { + kr.family = AF_INET6; + if (!in6_pton(req, count, (void *)&kr.addr, '\n', NULL)) + return -EINVAL; + } else if (strnchr(req, count, '.')) { + kr.family = AF_INET; + if (!in4_pton(req, count, (void *)&kr.addr, '\n', NULL)) + return -EINVAL; + } + + nf_ct_iterate_cleanup(net, kill_matching, &kr, 0, 0); + + return count; +} + static const struct file_operations ct_file_ops = { .owner = THIS_MODULE, .open = ct_open, .read = seq_read, + .write = ct_file_write, .llseek = seq_lseek, .release = seq_release_net, }; @@ -393,7 +450,7 @@ static int nf_conntrack_standalone_init_ { struct proc_dir_entry *pde; - pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops); + pde = proc_create("nf_conntrack", 0660, net->proc_net, &ct_file_ops); if (!pde) goto out_nf_conntrack;