From patchwork Thu Sep 26 09:50:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 11162133 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 464FD13B1 for ; Thu, 26 Sep 2019 09:50:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DBFE222C4 for ; Thu, 26 Sep 2019 09:50:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729117AbfIZJuP (ORCPT ); Thu, 26 Sep 2019 05:50:15 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:49450 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725980AbfIZJuP (ORCPT ); Thu, 26 Sep 2019 05:50:15 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iDQPc-0005BW-TY; Thu, 26 Sep 2019 09:50:12 +0000 From: Colin King To: Jens Axboe , Alexander Viro , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][next] io_uring: ensure variable ret is initialized to zero Date: Thu, 26 Sep 2019 10:50:12 +0100 Message-Id: <20190926095012.31826-1-colin.king@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Colin Ian King In the case where sig is NULL the error variable ret is not initialized and may contain a garbage value on the final checks to see if ret is -ERESTARTSYS. Best to initialize ret to zero before the do loop to ensure the ret does not accidentially contain -ERESTARTSYS before the loop. Addresses-Coverity: ("Uninitialized scalar variable") Fixes: dd671c79e40b ("io_uring: make CQ ring wakeups be more efficient") Signed-off-by: Colin Ian King --- fs/io_uring.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/io_uring.c b/fs/io_uring.c index 7b5710e3a18c..aa8ac557493c 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2835,6 +2835,7 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, return ret; } + ret = 0; iowq.nr_timeouts = atomic_read(&ctx->cq_timeouts); do { prepare_to_wait_exclusive(&ctx->wait, &iowq.wq,