From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDDB3C43381 for ; Fri, 22 Mar 2019 12:47:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EDFF2070D for ; Fri, 22 Mar 2019 12:47:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553258837; bh=TOvfeCbjiEgKTlYzY2570u9EMgzj1o4jdp6oy94vEKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wWFo0rb0NafRQmdTlnIPbBF/80BM4uiUnizwjJR8ztu5oJfXl3fBBDHrtzs7ElYL4 /c++wNimli4mSW1Zw9mVUfE1Re1IsiZastMABIxTGBM5WJx6GO1w608FlPI6Qzk7Xo baDBV5SW3pPC02AVbBUsShnRBRlzw0X8/xMifQOc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387853AbfCVL6g (ORCPT ); Fri, 22 Mar 2019 07:58:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:35356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387851AbfCVL6f (ORCPT ); Fri, 22 Mar 2019 07:58:35 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 85D1B2192D; Fri, 22 Mar 2019 11:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255915; bh=TOvfeCbjiEgKTlYzY2570u9EMgzj1o4jdp6oy94vEKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jxKSWhGuciE4y+8VNVd5BptAxrQOPwQLqKMccYE22uMyT0mu3QpUGwMm1UaRa8OiC o/xwPhJrn40x1dDMBLX9Mv3bXTW/hljlXCrDtiVO2G0g945bGGA1lupPN/MYjx4MLj tPXDAn7xYYYB8bdmFv4zWYFE7wWtDWALZyd6r6o0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Yufen Yu , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 053/280] floppy: check_events callback should not return a negative number Date: Fri, 22 Mar 2019 12:13:26 +0100 Message-Id: <20190322111309.283619713@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 96d7cb932e826219ec41ac02e5af037ffae6098c ] floppy_check_events() is supposed to return bit flags to say which events occured. We should return zero to say that no event flags are set. Only BIT(0) and BIT(1) are used in the caller. And .check_events interface also expect to return an unsigned int value. However, after commit a0c80efe5956, it may return -EINTR (-4u). Here, both BIT(0) and BIT(1) are cleared. So this patch shouldn't affect runtime, but it obviously is still worth fixing. Reviewed-by: Dan Carpenter Fixes: a0c80efe5956 ("floppy: fix lock_fdc() signal handling") Signed-off-by: Yufen Yu Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/floppy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index fdabd0b74492..a8de56f1936d 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4084,7 +4084,7 @@ static unsigned int floppy_check_events(struct gendisk *disk, if (time_after(jiffies, UDRS->last_checked + UDP->checkfreq)) { if (lock_fdc(drive)) - return -EINTR; + return 0; poll_drive(false, 0); process_fd_request(); } -- 2.19.1