From owner-svn-src-stable-11@freebsd.org Sat May 9 11:10:45 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6EFA52E53FC; Sat, 9 May 2020 11:10:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49K4Hn2PQQz4cdh; Sat, 9 May 2020 11:10:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4DA171AF30; Sat, 9 May 2020 11:10:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 049BAjt9068370; Sat, 9 May 2020 11:10:45 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 049BAjJN068369; Sat, 9 May 2020 11:10:45 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202005091110.049BAjJN068369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 9 May 2020 11:10:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r360842 - stable/11/sys/dev/isci/scil X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: stable/11/sys/dev/isci/scil X-SVN-Commit-Revision: 360842 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.32 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 May 2020 11:10:45 -0000 Author: dim Date: Sat May 9 11:10:44 2020 New Revision: 360842 URL: https://svnweb.freebsd.org/changeset/base/360842 Log: MFC r315205 (by cem): scif_sas_controller: Fix inverted logic range check PR: 217742 Submitted by: Svyatoslav Sponsored by: Viva64 (PVS-Studio) Modified: stable/11/sys/dev/isci/scil/scif_sas_controller.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/isci/scil/scif_sas_controller.c ============================================================================== --- stable/11/sys/dev/isci/scil/scif_sas_controller.c Sat May 9 10:55:34 2020 (r360841) +++ stable/11/sys/dev/isci/scil/scif_sas_controller.c Sat May 9 11:10:44 2020 (r360842) @@ -528,7 +528,7 @@ SCI_STATUS scif_user_parameters_set( if (scif_parms->sas.is_sata_ncq_enabled != 1 && scif_parms->sas.is_sata_ncq_enabled != 0) return SCI_FAILURE_INVALID_PARAMETER_VALUE; - if (scif_parms->sas.max_ncq_depth < 1 && scif_parms->sas.max_ncq_depth > 32) + if (scif_parms->sas.max_ncq_depth < 1 || scif_parms->sas.max_ncq_depth > 32) return SCI_FAILURE_INVALID_PARAMETER_VALUE; if (scif_parms->sas.is_sata_standby_timer_enabled != 1