Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
From:   Sultan Alsawaf <sultan@kerneltoast.com>
Date:   Fri, 15 Feb 2019 14:03:06 -0800
Message-ID: <CAFArEyWsuvEMFQ-CpTeawBbDY1egDzXf1HaOyd9z-uKcbSCq=Q@mail.gmail.com>
Subject: [PATCH] random: fix inconsistent spinlock usage
To:     tytso@mit.edu
Cc:     linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

All users of the struct entropy_store spinlock use the irqsave spinlock variant.
Spinlock users of the same lock should use be consistent in their use of a
certain spinlock primitive, which makes add_interrupt_randomness()'s spinlock
usage incorrect.

Fix the inconsistency by converting add_interrupt_randomness()'s spinlocks to
use the irqsave primitive.

Signed-off-by: Sultan Alsawaf <sultan@kerneltoast.com>
---
 drivers/char/random.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 38c6d1af6..1365017a7 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1239,6 +1239,7 @@ void add_interrupt_randomness(int irq, int irq_flags)
  __u64 ip;
  unsigned long seed;
  int credit = 0;
+ unsigned long flags;

  if (cycles == 0)
  cycles = get_reg(fast_pool, regs);
@@ -1269,7 +1270,7 @@ void add_interrupt_randomness(int irq, int irq_flags)
  return;

  r = &input_pool;
- if (!spin_trylock(&r->lock))
+ if (!spin_trylock_irqsave(&r->lock, flags))
  return;

  fast_pool->last = now;
@@ -1285,7 +1286,7 @@ void add_interrupt_randomness(int irq, int irq_flags)
  __mix_pool_bytes(r, &seed, sizeof(seed));
  credit = 1;
  }
- spin_unlock(&r->lock);
+ spin_unlock_irqrestore(&r->lock, flags);

  fast_pool->count = 0;

-- 
2.20.1