hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net, xfrm: convert sec_path.refcnt from atomic_t to refcount_t 

refcount_t type and corresponding API should be
used instead of atomic_t when the variable is used as
a reference counter. This allows to avoid accidental
refcounter overflows that might lead to use-after-free
situations.

Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
Signed-off-by: Hans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David Windsor <dwindsor@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Reshetova, Elena 2017-07-04 15:53:23 +03:00 committed by David S. Miller
parent 850a6212c6
commit 55eabed60a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/xfrm.h
View File

@ -1030,7 +1030,7 @@ struct xfrm_offload {
}; };
struct sec_path { struct sec_path {
atomic_t refcnt; refcount_t refcnt;
int len; int len;
int olen; int olen;
@ -1051,7 +1051,7 @@ static inline struct sec_path *
secpath_get(struct sec_path *sp) secpath_get(struct sec_path *sp)
{ {
if (sp) if (sp)
atomic_inc(&sp->refcnt); refcount_inc(&sp->refcnt);
return sp; return sp;
} }
@ -1060,7 +1060,7 @@ void __secpath_destroy(struct sec_path *sp);
static inline void static inline void
secpath_put(struct sec_path *sp) secpath_put(struct sec_path *sp)
{ {
if (sp && atomic_dec_and_test(&sp->refcnt)) if (sp && refcount_dec_and_test(&sp->refcnt))
__secpath_destroy(sp); __secpath_destroy(sp);
} }

4
net/xfrm/xfrm_input.c
View File

@ -116,7 +116,7 @@ struct sec_path *secpath_dup(struct sec_path *src)
for (i = 0; i < sp->len; i++) for (i = 0; i < sp->len; i++)
xfrm_state_hold(sp->xvec[i]); xfrm_state_hold(sp->xvec[i]);
} }
atomic_set(&sp->refcnt, 1); refcount_set(&sp->refcnt, 1);
return sp; return sp;
} }
EXPORT_SYMBOL(secpath_dup); EXPORT_SYMBOL(secpath_dup);
@ -126,7 +126,7 @@ int secpath_set(struct sk_buff *skb)
struct sec_path *sp; struct sec_path *sp;
/* Allocate new secpath or COW existing one. */ /* Allocate new secpath or COW existing one. */
if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) { if (!skb->sp || refcount_read(&skb->sp->refcnt) != 1) {
sp = secpath_dup(skb->sp); sp = secpath_dup(skb->sp);
if (!sp) if (!sp)
return -ENOMEM; return -ENOMEM;