diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-08-18 12:08:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-18 15:14:07 -0700 |
| commit | 9620fef27ed2cdb37bf6fd028f32bea2ef5119a8 (patch) | |
| tree | 7d4b243d0f353b98fd379d0d6ad800d734506e30 /net/core/dst.c | |
| parent | 633cefe390e59e9449dc88707235e57ac76b5c38 (diff) | |
| download | linux-stable-9620fef27ed2cdb37bf6fd028f32bea2ef5119a8.tar.gz linux-stable-9620fef27ed2cdb37bf6fd028f32bea2ef5119a8.tar.bz2 linux-stable-9620fef27ed2cdb37bf6fd028f32bea2ef5119a8.zip | |
ipv4: convert dst_metrics.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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dst.c')
| -rw-r--r-- | net/core/dst.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dst.c b/net/core/dst.c index 00aa972ad1a1..d6ead757c258 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -55,7 +55,7 @@ const struct dst_metrics dst_default_metrics = { * We really want to avoid false sharing on this variable, and catch * any writes on it. */ - .refcnt = ATOMIC_INIT(1), + .refcnt = REFCOUNT_INIT(1), }; void dst_init(struct dst_entry *dst, struct dst_ops *ops, @@ -213,7 +213,7 @@ u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old) struct dst_metrics *old_p = (struct dst_metrics *)__DST_METRICS_PTR(old); unsigned long prev, new; - atomic_set(&p->refcnt, 1); + refcount_set(&p->refcnt, 1); memcpy(p->metrics, old_p->metrics, sizeof(p->metrics)); new = (unsigned long) p; @@ -225,7 +225,7 @@ u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old) if (prev & DST_METRICS_READ_ONLY) p = NULL; } else if (prev & DST_METRICS_REFCOUNTED) { - if (atomic_dec_and_test(&old_p->refcnt)) + if (refcount_dec_and_test(&old_p->refcnt)) kfree(old_p); } } |