From patchwork Mon Jul 19 14:52:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479860 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4211926jao; Mon, 19 Jul 2021 08:06:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIIHgFNQC2PaWcCD7x/E1U5JaEJBNWrZK5QdJNzM4XrnV7HE9SO7iH1Qvzrr7UK2ZUPMs6 X-Received: by 2002:a6b:7114:: with SMTP id q20mr19168569iog.71.1626707177953; Mon, 19 Jul 2021 08:06:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707177; cv=none; d=google.com; s=arc-20160816; b=PaAfMwomh9WsbiiV+AGm1EroDjH+1cK6imoqIB4nAvWEo1gPUZpBMAw5z+mf/mFw1Q UNlwbn8XslZWQdeULD3hvzco3J66nia243jiDEqHeNHovqwUyqTn/dKgr7hAmHep166p XpIu9ytVyQ90pd5vG6bvBxFXmhk1GksYhpVQ9zUqyB7+oryAjIRKTgFp/rgUjkkU6bQE GEQEiOmXpro2AJ+HbzVSLyiMHqzZoRUwqYEodwsdm3t1aG58CcT1YVNk/BQaQR0mtT/a s2mWBNSOU2VHELNWqM12fBHwTPcOjoWLcZiBobuplR1WyuboOyzm1ZtG3A7Ksd+6frmh nixg== 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=L+92934g8skFGCKHTl68BngjY0Y7doqo7vKm1KuFXaQ=; b=EooCOPYJs8xi/pG+IRGkpwsh7Sf8jONqWGa1aknoMtbyYkntQRJfHiTZp5sThKu8CL 4/q7GcE0PUu02Y5Coutia0ARwW/VErq4PEEUUhKv4rIMm0K0Y5ZlKppABj0/RmwfdNeQ pGEZ+F5k28WHiTNDSd0HC0MAw1BUwTJ37D11Qa3zij5AqEmIvnoRFIztD543qCu36UNh fg0OJ7Flxz3/7QJTnniGcautpjzTI5DV0hS7rjR7uyBRsWI8hGl915LxkSDVCdQnKrE7 RYb+oMKJhe6bzQRIvmDbi6Gi7VDVfgGzE7xdX9/jgqhH+7CpDsEyRT0rrvFMd2f0IJiT v47A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RWj9Jm+p; 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 i9si21653919ioq.17.2021.07.19.08.06.17; Mon, 19 Jul 2021 08:06:17 -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=RWj9Jm+p; 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 S243187AbhGSOZf (ORCPT + 12 others); Mon, 19 Jul 2021 10:25:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:57198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242407AbhGSOXs (ORCPT ); Mon, 19 Jul 2021 10:23:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7F9FB61220; Mon, 19 Jul 2021 15:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626706995; bh=BMwHAXZgdhqQwUQ5+UshBBH8/SkY4gFxYKmSeVWpeAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RWj9Jm+ppPzacBZdYhweLM7HLfTzy1xgBJA0cwnQvyUQYWGdidwgeJCGEUEN3bv06 qYRxgTzSQ2FMuk0o19fD6NORBDymKzWLvT8SS41zwgLnhlPdMA97KeNfkwDIEJz40n rQcq2I7URJaeYZW2DK9A18ClmRm5P8YwkDDlIIdA= 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.4 178/188] um: fix error return code in winch_tramp() Date: Mon, 19 Jul 2021 16:52:42 +0200 Message-Id: <20210719144942.309325990@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144913.076563739@linuxfoundation.org> References: <20210719144913.076563739@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 3fd7c3efdb18..feb7f5ab4084 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;