]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ath9k: fix tx99 use after free
authorMiaoqing Pan <miaoqing@codeaurora.org>
Tue, 27 Jun 2017 14:31:49 +0000 (17:31 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Wed, 28 Jun 2017 16:52:21 +0000 (19:52 +0300)
One scenario that could lead to UAF is two threads writing
simultaneously to the "tx99" debug file. One of them would
set the "start" value to true and follow to ath9k_tx99_init().
Inside the function it would set the sc->tx99_state to true
after allocating sc->tx99skb. Then, the other thread would
execute write_file_tx99() and call ath9k_tx99_deinit().
sc->tx99_state would be freed. After that, the first thread
would continue inside ath9k_tx99_init() and call
r = ath9k_tx99_send(sc, sc->tx99_skb, &txctl);
that would make use of the freed sc->tx99_skb memory.

Cc: <stable@vger.kernel.org>
Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath9k/tx99.c

index a866cbda0799fc1fdf4de944bac9b18ae9db6673..49ed1afb913ca7f526159904e06db55bf800b2ed 100644 (file)
@@ -189,22 +189,27 @@ static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,
        if (strtobool(buf, &start))
                return -EINVAL;
 
+       mutex_lock(&sc->mutex);
+
        if (start == sc->tx99_state) {
                if (!start)
-                       return count;
+                       goto out;
                ath_dbg(common, XMIT, "Resetting TX99\n");
                ath9k_tx99_deinit(sc);
        }
 
        if (!start) {
                ath9k_tx99_deinit(sc);
-               return count;
+               goto out;
        }
 
        r = ath9k_tx99_init(sc);
-       if (r)
+       if (r) {
+               mutex_unlock(&sc->mutex);
                return r;
-
+       }
+out:
+       mutex_unlock(&sc->mutex);
        return count;
 }