Message ID | 20200227132216.601985562@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=mLYK=4P=vger.kernel.org=stable-owner@kernel.org> 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 52C72C52D58 for <stable@archiver.kernel.org>; Thu, 27 Feb 2020 14:02:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25C6B20578 for <stable@archiver.kernel.org>; Thu, 27 Feb 2020 14:02:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812173; bh=xagn8kmwgvViA4wMu5F0KPD03kbdfnDbrYabCaPa2J8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JVyS5f7e1Z4ohMARnHXp5A4WaXqQWNmR52AivtfqkksG5s7NAUBxWq+LGB/9CjvS2 34CTVecXphDTybNWixLn1LY6NNG+/HMC0D/pC25UXVeHpfnB+uaftMdPTalJJUrdfX sFKuiZxyZEhTzOBhQAID7+x0dzANRWjgCKt7eMrM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732902AbgB0OCv (ORCPT <rfc822;stable@archiver.kernel.org>); Thu, 27 Feb 2020 09:02:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:37710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733202AbgB0OCu (ORCPT <rfc822;stable@vger.kernel.org>); Thu, 27 Feb 2020 09:02:50 -0500 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 28C0E246B6; Thu, 27 Feb 2020 14:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812169; bh=xagn8kmwgvViA4wMu5F0KPD03kbdfnDbrYabCaPa2J8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kcJspthNseOyI/+ond4D4HlPSp7bJ2/dU9qrIr6+4gJIFD0fRoK9ru1gXYVdQU5fu 4OdMeSXBvSosB7uAwshEWrURbsUdG2+s0rRMS3Kyp5/brzr6AZv9CwOQl3y01fSSOz 4ZLYGAglMuCqKIUK3Ouy043a6C7OKXw3LdVBpHgw= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Jordy Zomer <jordy@simplyhacker.com>, Willy Tarreau <w@1wt.eu>, Dan Carpenter <dan.carpenter@oracle.com>, Linus Torvalds <torvalds@linux-foundation.org> Subject: [PATCH 4.19 12/97] floppy: check FDC index for errors before assigning it Date: Thu, 27 Feb 2020 14:36:20 +0100 Message-Id: <20200227132216.601985562@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132214.553656188@linuxfoundation.org> References: <20200227132214.553656188@linuxfoundation.org> User-Agent: quilt/0.66 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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -852,14 +852,17 @@ static void reset_fdc_info(int mode) /* selects the fdc and drive, and enables the fdc's input/dma. */ static void set_fdc(int drive) { + unsigned int new_fdc = fdc; + if (drive >= 0 && drive < N_DRIVE) { - fdc = FDC(drive); + new_fdc = FDC(drive); current_drive = drive; } - if (fdc != 1 && fdc != 0) { + if (new_fdc >= N_FDC) { pr_info("bad fdc value\n"); return; } + fdc = new_fdc; set_dor(fdc, ~0, 8); #if N_FDC > 1 set_dor(1 - fdc, ~8, 0);