From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-by2nam03on0110.outbound.protection.outlook.com ([104.47.42.110]:1213 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753364AbeA1W1F (ORCPT ); Sun, 28 Jan 2018 17:27:05 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Stefan Haberland , Martin Schwidefsky , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 050/100] s390/dasd: prevent prefix I/O error Date: Sun, 28 Jan 2018 22:26:31 +0000 Message-ID: <20180128222547.7398-50-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Stefan Haberland [ Upstream commit da340f921d3454f1521671c7a5a43ad3331fbe50 ] Prevent that a prefix flag is set based on invalid configuration data. The validity.verify_base flag should only be set for alias devices. Usually the unit address type is either one of base, PAV alias or HyperPAV alias. But in cases where the unit address type is not set or any other value the validity.verify_base flag might be set as well. This would lead to follow on errors. Explicitly check for alias devices and set the validity flag only for them. Signed-off-by: Stefan Haberland Reviewed-by: Jan Hoeppner Signed-off-by: Martin Schwidefsky Signed-off-by: Sasha Levin --- drivers/s390/block/dasd_eckd.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.= c index 8eafcd5fa004..5ede251c52ca 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c @@ -530,10 +530,12 @@ static int prefix_LRE(struct ccw1 *ccw, struct PFX_ec= kd_data *pfxdata, pfxdata->validity.define_extent =3D 1; =20 /* private uid is kept up to date, conf_data may be outdated */ - if (startpriv->uid.type !=3D UA_BASE_DEVICE) { + if (startpriv->uid.type =3D=3D UA_BASE_PAV_ALIAS) pfxdata->validity.verify_base =3D 1; - if (startpriv->uid.type =3D=3D UA_HYPER_PAV_ALIAS) - pfxdata->validity.hyper_pav =3D 1; + + if (startpriv->uid.type =3D=3D UA_HYPER_PAV_ALIAS) { + pfxdata->validity.verify_base =3D 1; + pfxdata->validity.hyper_pav =3D 1; } =20 rc =3D define_extent(NULL, dedata, trk, totrk, cmd, basedev, blksize); @@ -3414,10 +3416,12 @@ static int prepare_itcw(struct itcw *itcw, pfxdata.validity.define_extent =3D 1; =20 /* private uid is kept up to date, conf_data may be outdated */ - if (startpriv->uid.type !=3D UA_BASE_DEVICE) { + if (startpriv->uid.type =3D=3D UA_BASE_PAV_ALIAS) + pfxdata.validity.verify_base =3D 1; + + if (startpriv->uid.type =3D=3D UA_HYPER_PAV_ALIAS) { pfxdata.validity.verify_base =3D 1; - if (startpriv->uid.type =3D=3D UA_HYPER_PAV_ALIAS) - pfxdata.validity.hyper_pav =3D 1; + pfxdata.validity.hyper_pav =3D 1; } =20 switch (cmd) { --=20 2.11.0