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=-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=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 65C2EC2D0DB for ; Wed, 22 Jan 2020 09:54:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BB952465A for ; Wed, 22 Jan 2020 09:54:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579686860; bh=2WNeRsDryRBzpXQN44EbufOyKvzcVAspZ6zfgL6yVVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YhlCnNNKVel8T6qcIvKaBHzLPCMnt9hBaDg14jx7znXTOmEBR98ZTVoI1IKmzIeNy oakQhHrsOpdUtXs1xLz8hm15aoM+7IBa5Weh1275N4lCJ697H5GKwSpZX3wkSyUMwf fIMN8jurNjhUtYDRhESW4sMYqplQo3ueusFqvA9Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730154AbgAVJeT (ORCPT ); Wed, 22 Jan 2020 04:34:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:48680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729299AbgAVJeQ (ORCPT ); Wed, 22 Jan 2020 04:34:16 -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 28C332467F; Wed, 22 Jan 2020 09:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685655; bh=2WNeRsDryRBzpXQN44EbufOyKvzcVAspZ6zfgL6yVVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SW6dmiQ4mAplkXmxKpXVKyRStrkObEDqxWlJ4OkwhbUwIpliHUHkat08k/6OEkoSz cpZUUTjeApB8ov70HaCG59zZS8dj/Ux2DaEikV0h4lELyQz/tpYRwlD5GmJagnUJsD wXSgBX6C6uUTEwp2IQt5pmsPsirBU26IBhMguqno= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, James Bottomley , Luo Jiaxing , John Garry , "Martin K. Petersen" Subject: [PATCH 4.9 26/97] scsi: enclosure: Fix stale device oops with hot replug Date: Wed, 22 Jan 2020 10:28:30 +0100 Message-Id: <20200122092800.422150517@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092755.678349497@linuxfoundation.org> References: <20200122092755.678349497@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: X-Mailing-List: stable@vger.kernel.org From: James Bottomley commit 529244bd1afc102ab164429d338d310d5d65e60d upstream. Doing an add/remove/add on a SCSI device in an enclosure leads to an oops caused by poisoned values in the enclosure device list pointers. The reason is because we are keeping the enclosure device across the enclosed device add/remove/add but the current code is doing a device_add/device_del/device_add on it. This is the wrong thing to do in sysfs, so fix it by not doing a device_del on the enclosure device simply because of a hot remove of the drive in the slot. [mkp: added missing email addresses] Fixes: 43d8eb9cfd0a ("[SCSI] ses: add support for enclosure component hot removal") Link: https://lore.kernel.org/r/1578532892.3852.10.camel@HansenPartnership.com Signed-off-by: James Bottomley Reported-by: Luo Jiaxing Tested-by: John Garry Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/misc/enclosure.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/misc/enclosure.c +++ b/drivers/misc/enclosure.c @@ -419,10 +419,9 @@ int enclosure_remove_device(struct enclo cdev = &edev->component[i]; if (cdev->dev == dev) { enclosure_remove_links(cdev); - device_del(&cdev->cdev); put_device(dev); cdev->dev = NULL; - return device_add(&cdev->cdev); + return 0; } } return -ENODEV;