android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "raw: Fix NULL deref in raw_get_next()."

Browse Source 
This reverts commit b34056bedf.

It breaks the current Android kernel abi.  It will be brought back at
the next KABI break update.

Bug: 161946584
Change-Id: I3664de0db15ba207c8b35530840095083d376dd1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-04-23 08:16:31 +00:00 committed by Matthias Männich
parent a3a763fb37
commit cc7a00d2d6
4 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/raw.h
View File

@ -37,7 +37,7 @@ int raw_rcv(struct sock *, struct sk_buff *);
struct raw_hashinfo { struct raw_hashinfo {
spinlock_t lock; spinlock_t lock;
struct hlist_head ht[RAW_HTABLE_SIZE] ____cacheline_aligned; struct hlist_nulls_head ht[RAW_HTABLE_SIZE] ____cacheline_aligned;
}; };
static inline u32 raw_hashfunc(const struct net *net, u32 proto) static inline u32 raw_hashfunc(const struct net *net, u32 proto)
@ -51,7 +51,7 @@ static inline void raw_hashinfo_init(struct raw_hashinfo *hashinfo)
spin_lock_init(&hashinfo->lock); spin_lock_init(&hashinfo->lock);
for (i = 0; i < RAW_HTABLE_SIZE; i++) for (i = 0; i < RAW_HTABLE_SIZE; i++)
INIT_HLIST_HEAD(&hashinfo->ht[i]); INIT_HLIST_NULLS_HEAD(&hashinfo->ht[i], i);
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS

36
net/ipv4/raw.c
View File

@ -91,12 +91,12 @@ EXPORT_SYMBOL_GPL(raw_v4_hashinfo);
int raw_hash_sk(struct sock *sk) int raw_hash_sk(struct sock *sk)
{ {
struct raw_hashinfo *h = sk->sk_prot->h.raw_hash; struct raw_hashinfo *h = sk->sk_prot->h.raw_hash;
struct hlist_head *hlist; struct hlist_nulls_head *hlist;
hlist = &h->ht[raw_hashfunc(sock_net(sk), inet_sk(sk)->inet_num)]; hlist = &h->ht[raw_hashfunc(sock_net(sk), inet_sk(sk)->inet_num)];
spin_lock(&h->lock); spin_lock(&h->lock);
sk_add_node_rcu(sk, hlist); __sk_nulls_add_node_rcu(sk, hlist);
sock_set_flag(sk, SOCK_RCU_FREE); sock_set_flag(sk, SOCK_RCU_FREE);
spin_unlock(&h->lock); spin_unlock(&h->lock);
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
@ -110,7 +110,7 @@ void raw_unhash_sk(struct sock *sk)
struct raw_hashinfo *h = sk->sk_prot->h.raw_hash; struct raw_hashinfo *h = sk->sk_prot->h.raw_hash;
spin_lock(&h->lock); spin_lock(&h->lock);
if (sk_del_node_init_rcu(sk)) if (__sk_nulls_del_node_init_rcu(sk))
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
spin_unlock(&h->lock); spin_unlock(&h->lock);
} }
@ -163,15 +163,16 @@ static int icmp_filter(const struct sock *sk, const struct sk_buff *skb)
static int raw_v4_input(struct net *net, struct sk_buff *skb, static int raw_v4_input(struct net *net, struct sk_buff *skb,
const struct iphdr *iph, int hash) const struct iphdr *iph, int hash)
{ {
struct hlist_nulls_head *hlist;
struct hlist_nulls_node *hnode;
int sdif = inet_sdif(skb); int sdif = inet_sdif(skb);
struct hlist_head *hlist;
int dif = inet_iif(skb); int dif = inet_iif(skb);
int delivered = 0; int delivered = 0;
struct sock *sk; struct sock *sk;
hlist = &raw_v4_hashinfo.ht[hash]; hlist = &raw_v4_hashinfo.ht[hash];
rcu_read_lock(); rcu_read_lock();
sk_for_each_rcu(sk, hlist) { sk_nulls_for_each(sk, hnode, hlist) {
if (!raw_v4_match(net, sk, iph->protocol, if (!raw_v4_match(net, sk, iph->protocol,
iph->saddr, iph->daddr, dif, sdif)) iph->saddr, iph->daddr, dif, sdif))
continue; continue;
@ -263,9 +264,10 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info)
void raw_icmp_error(struct sk_buff *skb, int protocol, u32 info) void raw_icmp_error(struct sk_buff *skb, int protocol, u32 info)
{ {
struct net *net = dev_net(skb->dev); struct net *net = dev_net(skb->dev);
struct hlist_nulls_head *hlist;
struct hlist_nulls_node *hnode;
int dif = skb->dev->ifindex; int dif = skb->dev->ifindex;
int sdif = inet_sdif(skb); int sdif = inet_sdif(skb);
struct hlist_head *hlist;
const struct iphdr *iph; const struct iphdr *iph;
struct sock *sk; struct sock *sk;
int hash; int hash;
@ -274,7 +276,7 @@ void raw_icmp_error(struct sk_buff *skb, int protocol, u32 info)
hlist = &raw_v4_hashinfo.ht[hash]; hlist = &raw_v4_hashinfo.ht[hash];
rcu_read_lock(); rcu_read_lock();
sk_for_each_rcu(sk, hlist) { sk_nulls_for_each(sk, hnode, hlist) {
iph = (const struct iphdr *)skb->data; iph = (const struct iphdr *)skb->data;
if (!raw_v4_match(net, sk, iph->protocol, if (!raw_v4_match(net, sk, iph->protocol,
iph->daddr, iph->saddr, dif, sdif)) iph->daddr, iph->saddr, dif, sdif))
@ -946,13 +948,14 @@ static struct sock *raw_get_first(struct seq_file *seq, int bucket)
{ {
struct raw_hashinfo *h = pde_data(file_inode(seq->file)); struct raw_hashinfo *h = pde_data(file_inode(seq->file));
struct raw_iter_state *state = raw_seq_private(seq); struct raw_iter_state *state = raw_seq_private(seq);
struct hlist_head *hlist; struct hlist_nulls_head *hlist;
struct hlist_nulls_node *hnode;
struct sock *sk; struct sock *sk;
for (state->bucket = bucket; state->bucket < RAW_HTABLE_SIZE; for (state->bucket = bucket; state->bucket < RAW_HTABLE_SIZE;
++state->bucket) { ++state->bucket) {
hlist = &h->ht[state->bucket]; hlist = &h->ht[state->bucket];
sk_for_each(sk, hlist) { sk_nulls_for_each(sk, hnode, hlist) {
if (sock_net(sk) == seq_file_net(seq)) if (sock_net(sk) == seq_file_net(seq))
return sk; return sk;
} }
@ -965,7 +968,7 @@ static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk)
struct raw_iter_state *state = raw_seq_private(seq); struct raw_iter_state *state = raw_seq_private(seq);
do { do {
sk = sk_next(sk); sk = sk_nulls_next(sk);
} while (sk && sock_net(sk) != seq_file_net(seq)); } while (sk && sock_net(sk) != seq_file_net(seq));
if (!sk) if (!sk)
@ -984,12 +987,9 @@ static struct sock *raw_get_idx(struct seq_file *seq, loff_t pos)
} }
void *raw_seq_start(struct seq_file *seq, loff_t *pos) void *raw_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(&h->lock) __acquires(RCU)
{ {
struct raw_hashinfo *h = pde_data(file_inode(seq->file)); rcu_read_lock();
spin_lock(&h->lock);
return *pos ? raw_get_idx(seq, *pos - 1) : SEQ_START_TOKEN; return *pos ? raw_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
} }
EXPORT_SYMBOL_GPL(raw_seq_start); EXPORT_SYMBOL_GPL(raw_seq_start);
@ -1008,11 +1008,9 @@ void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)
EXPORT_SYMBOL_GPL(raw_seq_next); EXPORT_SYMBOL_GPL(raw_seq_next);
void raw_seq_stop(struct seq_file *seq, void *v) void raw_seq_stop(struct seq_file *seq, void *v)
__releases(&h->lock) __releases(RCU)
{ {
struct raw_hashinfo *h = pde_data(file_inode(seq->file)); rcu_read_unlock();
spin_unlock(&h->lock);
} }
EXPORT_SYMBOL_GPL(raw_seq_stop); EXPORT_SYMBOL_GPL(raw_seq_stop);

10
net/ipv4/raw_diag.c
View File

@ -57,7 +57,8 @@ static bool raw_lookup(struct net *net, struct sock *sk,
static struct sock *raw_sock_get(struct net *net, const struct inet_diag_req_v2 *r) static struct sock *raw_sock_get(struct net *net, const struct inet_diag_req_v2 *r)
{ {
struct raw_hashinfo *hashinfo = raw_get_hashinfo(r); struct raw_hashinfo *hashinfo = raw_get_hashinfo(r);
struct hlist_head *hlist; struct hlist_nulls_head *hlist;
struct hlist_nulls_node *hnode;
struct sock *sk; struct sock *sk;
int slot; int slot;
@ -67,7 +68,7 @@ static struct sock *raw_sock_get(struct net *net, const struct inet_diag_req_v2
rcu_read_lock(); rcu_read_lock();
for (slot = 0; slot < RAW_HTABLE_SIZE; slot++) { for (slot = 0; slot < RAW_HTABLE_SIZE; slot++) {
hlist = &hashinfo->ht[slot]; hlist = &hashinfo->ht[slot];
sk_for_each_rcu(sk, hlist) { sk_nulls_for_each(sk, hnode, hlist) {
if (raw_lookup(net, sk, r)) { if (raw_lookup(net, sk, r)) {
/* /*
* Grab it and keep until we fill * Grab it and keep until we fill
@ -141,8 +142,9 @@ static void raw_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
struct raw_hashinfo *hashinfo = raw_get_hashinfo(r); struct raw_hashinfo *hashinfo = raw_get_hashinfo(r);
struct net *net = sock_net(skb->sk); struct net *net = sock_net(skb->sk);
struct inet_diag_dump_data *cb_data; struct inet_diag_dump_data *cb_data;
struct hlist_nulls_head *hlist;
struct hlist_nulls_node *hnode;
int num, s_num, slot, s_slot; int num, s_num, slot, s_slot;
struct hlist_head *hlist;
struct sock *sk = NULL; struct sock *sk = NULL;
struct nlattr *bc; struct nlattr *bc;
@ -159,7 +161,7 @@ static void raw_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
num = 0; num = 0;
hlist = &hashinfo->ht[slot]; hlist = &hashinfo->ht[slot];
sk_for_each_rcu(sk, hlist) { sk_nulls_for_each(sk, hnode, hlist) {
struct inet_sock *inet = inet_sk(sk); struct inet_sock *inet = inet_sk(sk);
if (!net_eq(sock_net(sk), net)) if (!net_eq(sock_net(sk), net))

10
net/ipv6/raw.c
View File

@ -141,9 +141,10 @@ EXPORT_SYMBOL(rawv6_mh_filter_unregister);
static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr) static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
{ {
struct net *net = dev_net(skb->dev); struct net *net = dev_net(skb->dev);
struct hlist_nulls_head *hlist;
struct hlist_nulls_node *hnode;
const struct in6_addr *saddr; const struct in6_addr *saddr;
const struct in6_addr *daddr; const struct in6_addr *daddr;
struct hlist_head *hlist;
struct sock *sk; struct sock *sk;
bool delivered = false; bool delivered = false;
__u8 hash; __u8 hash;
@ -154,7 +155,7 @@ static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
hash = raw_hashfunc(net, nexthdr); hash = raw_hashfunc(net, nexthdr);
hlist = &raw_v6_hashinfo.ht[hash]; hlist = &raw_v6_hashinfo.ht[hash];
rcu_read_lock(); rcu_read_lock();
sk_for_each_rcu(sk, hlist) { sk_nulls_for_each(sk, hnode, hlist) {
int filtered; int filtered;
if (!raw_v6_match(net, sk, nexthdr, daddr, saddr, if (!raw_v6_match(net, sk, nexthdr, daddr, saddr,
@ -332,14 +333,15 @@ void raw6_icmp_error(struct sk_buff *skb, int nexthdr,
u8 type, u8 code, int inner_offset, __be32 info) u8 type, u8 code, int inner_offset, __be32 info)
{ {
struct net *net = dev_net(skb->dev); struct net *net = dev_net(skb->dev);
struct hlist_head *hlist; struct hlist_nulls_head *hlist;
struct hlist_nulls_node *hnode;
struct sock *sk; struct sock *sk;
int hash; int hash;
hash = raw_hashfunc(net, nexthdr); hash = raw_hashfunc(net, nexthdr);
hlist = &raw_v6_hashinfo.ht[hash]; hlist = &raw_v6_hashinfo.ht[hash];
rcu_read_lock(); rcu_read_lock();
sk_for_each_rcu(sk, hlist) { sk_nulls_for_each(sk, hnode, hlist) {
/* Note: ipv6_hdr(skb) != skb->data */ /* Note: ipv6_hdr(skb) != skb->data */
const struct ipv6hdr *ip6h = (const struct ipv6hdr *)skb->data; const struct ipv6hdr *ip6h = (const struct ipv6hdr *)skb->data;