Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

There were quite a few overlapping sets of changes here.

Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.

Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly.  If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.

In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().

Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.

The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 19 insertions, 12 deletions

diff --git a/security/keys/proc.c b/security/keys/proc.c
index de834309d100..6d1fcbba1e09 100644
--- a/security/keys/proc.c
+++ b/security/keys/proc.c
@@ -179,9 +179,12 @@ static int proc_keys_show(struct seq_file *m, void *v)
         struct rb_node *_p = v;
         struct key *key = rb_entry(_p, struct key, serial_node);
         struct timespec now;
+        time_t expiry;
         unsigned long timo;
+        unsigned long flags;
         key_ref_t key_ref, skey_ref;
         char xbuf[16];
+        short state;
         int rc;
 
         struct keyring_search_context ctx = {
@@ -217,12 +220,13 @@ static int proc_keys_show(struct seq_file *m, void *v)
         rcu_read_lock();
 
         /* come up with a suitable timeout value */
-        if (key->expiry == 0) {
+        expiry = READ_ONCE(key->expiry);
+        if (expiry == 0) {
                 memcpy(xbuf, "perm", 5);
-        } else if (now.tv_sec >= key->expiry) {
+        } else if (now.tv_sec >= expiry) {
                 memcpy(xbuf, "expd", 5);
         } else {
-                timo = key->expiry - now.tv_sec;
+                timo = expiry - now.tv_sec;
 
                 if (timo < 60)
                         sprintf(xbuf, "%lus", timo);
@@ -236,18 +240,21 @@ static int proc_keys_show(struct seq_file *m, void *v)
                         sprintf(xbuf, "%luw", timo / (60*60*24*7));
         }
 
-#define showflag(KEY, LETTER, FLAG) \
-        (test_bit(FLAG, &(KEY)->flags) ? LETTER : '-')
+        state = key_read_state(key);
 
+#define showflag(FLAGS, LETTER, FLAG) \
+        ((FLAGS & (1 << FLAG)) ? LETTER : '-')
+
+        flags = READ_ONCE(key->flags);
         seq_printf(m, "%08x %c%c%c%c%c%c%c %5d %4s %08x %5d %5d %-9.9s ",
                    key->serial,
-                   showflag(key, 'I', KEY_FLAG_INSTANTIATED),
-                   showflag(key, 'R', KEY_FLAG_REVOKED),
-                   showflag(key, 'D', KEY_FLAG_DEAD),
-                   showflag(key, 'Q', KEY_FLAG_IN_QUOTA),
-                   showflag(key, 'U', KEY_FLAG_USER_CONSTRUCT),
-                   showflag(key, 'N', KEY_FLAG_NEGATIVE),
-                   showflag(key, 'i', KEY_FLAG_INVALIDATED),
+                   state != KEY_IS_UNINSTANTIATED ? 'I' : '-',
+                   showflag(flags, 'R', KEY_FLAG_REVOKED),
+                   showflag(flags, 'D', KEY_FLAG_DEAD),
+                   showflag(flags, 'Q', KEY_FLAG_IN_QUOTA),
+                   showflag(flags, 'U', KEY_FLAG_USER_CONSTRUCT),
+                   state < 0 ? 'N' : '-',
+                   showflag(flags, 'i', KEY_FLAG_INVALIDATED),
                    refcount_read(&key->usage),
                    xbuf,
                    key->perm,