From patchwork Mon Jul 19 14:53:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 479967 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4249745jao; Mon, 19 Jul 2021 08:47:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziNtzdASKU/MDZbzJu3Js0tRhezAsCFf9kwuQtk8n+fE59l+hMPI177pOWR3rdelxPu6LU X-Received: by 2002:a17:906:2287:: with SMTP id p7mr27979735eja.181.1626709653697; Mon, 19 Jul 2021 08:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709653; cv=none; d=google.com; s=arc-20160816; b=kD4TOYW8AeeQegemIueaam0foKJfKtLCx7vJ2U+WA+dDKGMFe7l2lnnFCBBoIcAY1q XvgJsiQQYuXfHIdHHOUJoRzpUFLPbtrM1WVFYhYP/NyUztrb/yx5nmKF/R59PG1iZ3eW /eAxRGIprl9gJ28EofFkkI1sarlPu8QxZRZajDB9fnPxrrStoNWTk+g0iX4pfaHmBlIN dXURLYynix6vQwoQJJna2ZKUl/FukrFso2j9625ZSuHMqS+CzovXHeTPte3PaiGTANP3 NGXxAzY+lB2taAme9ULULogcP8xlOaXF4Ey1alMO5o3Sc36oiy4G2F5HE65ObGi5BzeT Qt8g== 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=9JU1iqiVGxQiGiMJ80ySqkVWTlNnn60AuNfGHZ9/8n0=; b=f2njlfbaOdI9ASAb1jCJbdN2cm4DntLBqCfXSlNKqhk/2WubRzKGO/56K8RNLYTqS1 b79LJEDN0a7qKZ0MCLXbyOTjPyV57E6ugGaBYXlZv+gJ9yhdVg9dX7l8u8Wl8KdoHyw8 ToFWFQdF4LFW7f+5hMe7K0PTx2ktNqBVDoBE0SH63F5ewBXm1rdWqreXktfZX8Vq0G7N QfPRgLGlPyCfnEfHhOEjVhway06tmQDvGObochndURsm2IY39aya3FcwfwZgv44EkctZ jvTrGYkBAvBtd57B21s0jQ0H6locxf4DXyOi2yUidRafe+9RO3JjfH3aZXe6fqNFWL7a 6BrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IJ8zFoVS; 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.33; Mon, 19 Jul 2021 08:47:33 -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=IJ8zFoVS; 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 S1344736AbhGSPGk (ORCPT + 12 others); Mon, 19 Jul 2021 11:06:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:32996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345484AbhGSPEd (ORCPT ); Mon, 19 Jul 2021 11:04:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CBBBD61364; Mon, 19 Jul 2021 15:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709442; bh=ppW35qgSusQj6wBIpMSCIYMQAiPVAwVu0i48L2F97tA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IJ8zFoVSfsUlxNSwl5SyJ1ap0Xy6aGHfCQQmxtDj4GczwoeScUZlx1lD1xJqVIYqw 6/W0tbT1mn1oIYYVKEPJSQzTTt3cW7PaTsVeDM2bbdxA3xF/Y7QaGRDMQKmOVJiz9k zBbuIVwsb8DTmNhN1BXZVP0PQ12pcmS59gLNCWJQ= 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 385/421] um: fix error return code in slip_open() Date: Mon, 19 Jul 2021 16:53:16 +0200 Message-Id: <20210719144959.729982081@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 b77e81fbe5f5fb4ad9a61ec80f6d1e30b6da093a ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: a3c77c67a443 ("[PATCH] uml: slirp and slip driver cleanups and 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/slip_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c index 0d6b66c64a81..76d155631c5d 100644 --- a/arch/um/drivers/slip_user.c +++ b/arch/um/drivers/slip_user.c @@ -145,7 +145,8 @@ static int slip_open(void *data) } sfd = err; - if (set_up_tty(sfd)) + err = set_up_tty(sfd); + if (err) goto out_close2; pri->slave = sfd;