Author: andrew
Date: Tue Jul  4 10:54:08 2017
New Revision: 320641
URL: https://svnweb.freebsd.org/changeset/base/320641

Log:
  MFC r320403, r320497
  
  r320403:
  Some of the atomic_clear_* functions were incorrectly defined to be an
  atomic add. Correct these, fixing a NULL-pointer dereference in netgraph.
  
  PR:           220273
  Sponsored by: DARPA, AFRL
  
  r320497:
  Remove a blank line accidentally added in r320403.

Modified:
  stable/11/sys/arm64/include/atomic.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm64/include/atomic.h
==============================================================================
--- stable/11/sys/arm64/include/atomic.h        Tue Jul  4 07:07:08 2017        
(r320640)
+++ stable/11/sys/arm64/include/atomic.h        Tue Jul  4 10:54:08 2017        
(r320641)
@@ -385,7 +385,7 @@ atomic_store_rel_64(volatile uint64_t *p, uint64_t val
 
 #define        atomic_add_rel_int              atomic_add_rel_32
 #define        atomic_fcmpset_rel_int          atomic_fcmpset_rel_32
-#define        atomic_clear_rel_int            atomic_add_rel_32
+#define        atomic_clear_rel_int            atomic_clear_rel_32
 #define        atomic_cmpset_rel_int           atomic_cmpset_rel_32
 #define        atomic_set_rel_int              atomic_set_rel_32
 #define        atomic_subtract_rel_int         atomic_subtract_rel_32
@@ -413,7 +413,7 @@ atomic_store_rel_64(volatile uint64_t *p, uint64_t val
 
 #define        atomic_add_acq_long             atomic_add_acq_64
 #define        atomic_fcmpset_acq_long         atomic_fcmpset_acq_64
-#define        atomic_clear_acq_long           atomic_add_acq_64
+#define        atomic_clear_acq_long           atomic_clear_acq_64
 #define        atomic_cmpset_acq_long          atomic_cmpset_acq_64
 #define        atomic_load_acq_long            atomic_load_acq_64
 #define        atomic_set_acq_long             atomic_set_acq_64
@@ -421,7 +421,7 @@ atomic_store_rel_64(volatile uint64_t *p, uint64_t val
 
 #define        atomic_add_acq_ptr              atomic_add_acq_64
 #define        atomic_fcmpset_acq_ptr          atomic_fcmpset_acq_64
-#define        atomic_clear_acq_ptr            atomic_add_acq_64
+#define        atomic_clear_acq_ptr            atomic_clear_acq_64
 #define        atomic_cmpset_acq_ptr           atomic_cmpset_acq_64
 #define        atomic_load_acq_ptr             atomic_load_acq_64
 #define        atomic_set_acq_ptr              atomic_set_acq_64
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to