From patchwork Mon Jul 19 14:53:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479966 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4249724jao; Mon, 19 Jul 2021 08:47:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzK9Qd/9fe701Jdts7bmwZgA3mtRsbn6jJ3KOJe5j4+Xfh/AWP6m7XLxKszH3ccImnKUeyr X-Received: by 2002:a17:906:1b14:: with SMTP id o20mr27534757ejg.204.1626709652741; Mon, 19 Jul 2021 08:47:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709652; cv=none; d=google.com; s=arc-20160816; b=AU3jWi6CoVdMqOuK/tIqDr1xlCPWAKPR4nl+8qhDPOQSZdqFT1aFlxUfWE23O+quYt a/4n1sOG1KL909YAJ6WuEnM5FuLBREM2i9WgilU8+I1uR0fJOHwsEINZHgaequSYylTo AFVxXI0qKEeVZUxssLZow3WqTyGBQOnqLuP+xA1VUz5kMZZ+VVzSfFU+BA0DKOz7zDDo 1PY9jYRUxgGryJhIOBAqfVj0eg1+K2pB0bpk/CmDJkOIU17YwnQd7j4Vv/xKD9iu8rgc 3KEd2qUs4vAUJF12c4oA0JNUReCFiX45Nxvfz48CO/aQbi0t7rA/ZqQBaObxUbXujpen RKAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=usQdEOeglQyQJXKjTitecyjsU/21ut1+piBMiRP1W8E=; b=bVh5TTVKGdIov5cKyakozs+hMX3dGpasBWp4xKy+MPQcDkJDeVjuyxdBUdv4Xqucs8 hNgBXCvOAZ1VkKzUgYlPjwN3Et2fl4yGHLnbq1AwNvqwW4NAAP+0xsdgRQPnrfkZIgvj tcibDUsEFlqM0+hR5DGa/U6nZPYG27PgYGPHTeHS69lVbh8bH5y+ERzWUrEPVWZeZXZU D9mE3t/szQ1L+tp6jBU/JmhkcfMX060TG3q0W0i2A8LvagLCW37+gvaNc3jhtsvDoaVd r2K3SQ/YK7LzW6H3VdBb9yott6Xz6LUJu5I/XR3A5+hk/UaM3zBR6VU1jSa8jEzdGH7i yLBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vC1USwEr; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z11si402714edb.95.2021.07.19.08.47.32; Mon, 19 Jul 2021 08:47:32 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vC1USwEr; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344729AbhGSPGj (ORCPT + 12 others); Mon, 19 Jul 2021 11:06:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:33248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345488AbhGSPEd (ORCPT ); Mon, 19 Jul 2021 11:04:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0BC8C61222; Mon, 19 Jul 2021 15:44:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709444; bh=tVeVkGG/MmAyhCGUxk5QVDwrSECRghS7ZDYKBuA6pgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vC1USwEru7xqcjO1xqfh9eravdvOLy7uDVrEwnAJEdfUg1MfcMqOUz3yC3r+X7kq0 M9cQnmF2FnEhK03OfMbroCbbHmCaSGxXaCGFp0YipxJxp5XLP2KrocyPrvOb87o03c uuWsJDn+uQ4q4C4tgYa4cPjGhK2R62DPyh4CcHWc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , anton.ivanov@cambridgegreys.com, Richard Weinberger , Sasha Levin Subject: [PATCH 4.19 386/421] um: fix error return code in winch_tramp() Date: Mon, 19 Jul 2021 16:53:17 +0200 Message-Id: <20210719144959.766261669@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit ccf1236ecac476d9d2704866d9a476c86e387971 ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 89df6bfc0405 ("uml: DEBUG_SHIRQ fixes") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Acked-By: anton.ivanov@cambridgegreys.com Signed-off-by: Richard Weinberger Signed-off-by: Sasha Levin --- arch/um/drivers/chan_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index 9cffbbb15c56..669124d5290b 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c @@ -256,7 +256,8 @@ static int winch_tramp(int fd, struct tty_port *port, int *fd_out, goto out_close; } - if (os_set_fd_block(*fd_out, 0)) { + err = os_set_fd_block(*fd_out, 0); + if (err) { printk(UM_KERN_ERR "winch_tramp: failed to set thread_fd " "non-blocking.\n"); goto out_close;