mirror of
https://github.com/torvalds/linux.git
synced 2025-11-04 10:40:15 +02:00
7055420fb6
When there exist a pair of raw sockets one unbound and one bound to a VRF but equal in all other respects, when a packet is received in the VRF context, __raw_v4_lookup() matches on both sockets. This results in the packet being delivered over both sockets, instead of only the raw socket bound to the VRF. The bound device checks in __raw_v4_lookup() are replaced with a call to raw_sk_bound_dev_eq() which correctly handles whether the packet should be delivered over the unbound socket in such cases. In __raw_v6_lookup() the match on the device binding of the socket is similarly updated to use raw_sk_bound_dev_eq() which matches the handling in __raw_v4_lookup(). Importantly raw_sk_bound_dev_eq() takes the raw_l3mdev_accept sysctl into account. Signed-off-by: Duncan Eastoe <deastoe@vyatta.att-mail.com> Signed-off-by: Mike Manning <mmanning@vyatta.att-mail.com> Reviewed-by: David Ahern <dsahern@gmail.com> Tested-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
89 lines
2.3 KiB
C
89 lines
2.3 KiB
C
/*
|
|
* INET An implementation of the TCP/IP protocol suite for the LINUX
|
|
* operating system. INET is implemented using the BSD Socket
|
|
* interface as the means of communication with the user level.
|
|
*
|
|
* Definitions for the RAW-IP module.
|
|
*
|
|
* Version: @(#)raw.h 1.0.2 05/07/93
|
|
*
|
|
* Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
#ifndef _RAW_H
|
|
#define _RAW_H
|
|
|
|
#include <net/inet_sock.h>
|
|
#include <net/protocol.h>
|
|
#include <linux/icmp.h>
|
|
|
|
extern struct proto raw_prot;
|
|
|
|
extern struct raw_hashinfo raw_v4_hashinfo;
|
|
struct sock *__raw_v4_lookup(struct net *net, struct sock *sk,
|
|
unsigned short num, __be32 raddr,
|
|
__be32 laddr, int dif, int sdif);
|
|
|
|
int raw_abort(struct sock *sk, int err);
|
|
void raw_icmp_error(struct sk_buff *, int, u32);
|
|
int raw_local_deliver(struct sk_buff *, int);
|
|
|
|
int raw_rcv(struct sock *, struct sk_buff *);
|
|
|
|
#define RAW_HTABLE_SIZE MAX_INET_PROTOS
|
|
|
|
struct raw_hashinfo {
|
|
rwlock_t lock;
|
|
struct hlist_head ht[RAW_HTABLE_SIZE];
|
|
};
|
|
|
|
#ifdef CONFIG_PROC_FS
|
|
int raw_proc_init(void);
|
|
void raw_proc_exit(void);
|
|
|
|
struct raw_iter_state {
|
|
struct seq_net_private p;
|
|
int bucket;
|
|
};
|
|
|
|
static inline struct raw_iter_state *raw_seq_private(struct seq_file *seq)
|
|
{
|
|
return seq->private;
|
|
}
|
|
void *raw_seq_start(struct seq_file *seq, loff_t *pos);
|
|
void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos);
|
|
void raw_seq_stop(struct seq_file *seq, void *v);
|
|
#endif
|
|
|
|
int raw_hash_sk(struct sock *sk);
|
|
void raw_unhash_sk(struct sock *sk);
|
|
void raw_init(void);
|
|
|
|
struct raw_sock {
|
|
/* inet_sock has to be the first member */
|
|
struct inet_sock inet;
|
|
struct icmp_filter filter;
|
|
u32 ipmr_table;
|
|
};
|
|
|
|
static inline struct raw_sock *raw_sk(const struct sock *sk)
|
|
{
|
|
return (struct raw_sock *)sk;
|
|
}
|
|
|
|
static inline bool raw_sk_bound_dev_eq(struct net *net, int bound_dev_if,
|
|
int dif, int sdif)
|
|
{
|
|
#if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)
|
|
return inet_bound_dev_eq(!!net->ipv4.sysctl_raw_l3mdev_accept,
|
|
bound_dev_if, dif, sdif);
|
|
#else
|
|
return inet_bound_dev_eq(true, bound_dev_if, dif, sdif);
|
|
#endif
|
|
}
|
|
|
|
#endif /* _RAW_H */
|