From patchwork Wed May 31 18:31:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 769308 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wdJwJ30mmz9s78 for ; Thu, 1 Jun 2017 04:31:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lVmSc6lj"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751160AbdEaSbn (ORCPT ); Wed, 31 May 2017 14:31:43 -0400 Received: from mail-yb0-f195.google.com ([209.85.213.195]:34273 "EHLO mail-yb0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751034AbdEaSbm (ORCPT ); Wed, 31 May 2017 14:31:42 -0400 Received: by mail-yb0-f195.google.com with SMTP id o185so747747yba.1 for ; Wed, 31 May 2017 11:31:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=wDL1Vns7Sl0KHotGPuM4l54Nj3cwTblCO8qoMpIoANA=; b=lVmSc6ljuI5LW0lWdTXQhpTUh3JV6p01/ak6CqvfgHfIdbr/5/YHTSvDhOJwVgyiCt tJGzTzrBdQosYQWY6z8rHsWqyoSFShdlSQUstpyP0y4gDB9BIvE+XxflVRGWOuhkUpmf tPYCHikixB97Bl8jKCx9C1/ne7FbqOsAjli7d9ucKJtmvjZIvH9OPCq35Trsl8l+xq/3 cNLn/NZ41dq9togZjWgwZNE7vbhmyF3uq7J+dt9dfmRRe8qKsZeCwv/Eu2Sk19nHzgCY 94gv5lVc6fGc/NwCQx7rsTwn58yO+WsFM6+x/VpMxAUb8XWUIdSoPCTUQrtXuts6Ed3q G9zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=wDL1Vns7Sl0KHotGPuM4l54Nj3cwTblCO8qoMpIoANA=; b=qfIWNI+bTOw5maTZeWTYrWrU7+RIvcclETZvFyUJIc5elKT96LeIHSgsBl9EDw4z4Z JMif8G9oCucxOaPE5hwneaLXuEiZESkSQK0w0AyaKThx/+fCBzai0u4Oj2YFeZVDISdK CSn0w11HJN9ij4rep2nK6vtg5qBXzttS4abon/zDSKcbGNBVDVQcLOG655vBxqHQiHqX JFq4hFXpmPUBK7TvMPBC5WLqZDQrAQ1+prnJkrOIVXxuuKIlpXmUINqTgXcbw9+Yxgau /9Mtik2tAenjASp5/xd5NyreIVRG9i03dmjxrf5zE/ah8fb4gGTyhkfT4EbUY7GN/ow3 /O2g== X-Gm-Message-State: AODbwcATpzak1Nj3OWsj4quam33kr9NM38k+qHMjMj0XFEyxx68zXN7E kpUIE6bSPSY6lQ== X-Received: by 10.37.248.16 with SMTP id u16mr7274556ybd.100.1496255502011; Wed, 31 May 2017 11:31:42 -0700 (PDT) Received: from localhost ([2620:10d:c091:200::ffa9]) by smtp.gmail.com with ESMTPSA id h1sm7716675ywk.57.2017.05.31.11.31.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 May 2017 11:31:41 -0700 (PDT) Date: Wed, 31 May 2017 14:31:40 -0400 From: Tejun Heo To: Petru Mihancea Cc: linux-ide@vger.kernel.org Subject: [PATCH libata/for-4.12-fixes] libata: fix error checking in in ata_parse_force_one() Message-ID: <20170531183140.GB4795@htj.duckdns.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From f7cf69ae171592d133c69b9adaa5de7cfb6038ea Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 31 May 2017 14:26:26 -0400 ata_parse_force_one() was incorrectly comparing @p to @endp when it should have been comparing @id. The only consequence is that it may end up using an invalid port number in "libata.force" module param instead of rejecting it. Signed-off-by: Tejun Heo Reported-by: Petru-Florin Mihancea Link: https://bugzilla.kernel.org/show_bug.cgi?id=195785 --- Applied to libata/for-4.12-fixes. Thanks. drivers/ata/libata-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 2d83b8c75965..e157a0e44419 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -6800,7 +6800,7 @@ static int __init ata_parse_force_one(char **cur, } force_ent->port = simple_strtoul(id, &endp, 10); - if (p == endp || *endp != '\0') { + if (id == endp || *endp != '\0') { *reason = "invalid port/link"; return -EINVAL; }