From patchwork Tue Jun 8 18:26:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 455810 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp4020514jae; Tue, 8 Jun 2021 11:59:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKCMDPhb73GEsTkGNv+jJ9ErmpWBCRtHLGRkLSXzMykONr4bCraZgGhjVYwNR+iK+RMxcQ X-Received: by 2002:a17:907:9721:: with SMTP id jg33mr15159960ejc.64.1623178780069; Tue, 08 Jun 2021 11:59:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623178780; cv=none; d=google.com; s=arc-20160816; b=0EvTHOyPz7rqH9u4TX/Dr/cdEC1dTiEA+pWFCijTt03Op0viEEaL8g0oaLsnQ6Mfdc uI8MexvnGOVZdD7lNUcYx+wcTTnqKJ812IPOgFubzCUvyfrYmHjH0SGrZC7G+VxBhfoW FkL8n3niZEDSgqL+BKmGUYgCLxeZIwKg2t3JVuzbXcmj5djni9wmXbx+hvSGYIiTTpv+ vAFuP5NICwnAeHAXOw/5HRtu0rjg76wRiHgwzWTlnkfuqkQuiHR8LhGTEHMURBcvUoIX p8F1dHMfnGgBhks8j9n7ypTnOPKyJkozQ8slF65owinfeYQO0hvVtjbvIbjJTeRIAwxt 4IKA== 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=XqJrjhhG3blnYqBdrbv1fg7E+vUFnMWVoYTfH9T3ob4=; b=HUp81xPTwVVAgjfCNPLAMrO9C12c3CFxXm+uAqFQW8smOk8WUNjNzbXeE+EAl61kYA 09rnsCapbN5DLwFWyIBgTP9+yEBgzkrFo+vKfYMXHo1SiqPdiGDKKfK36i3Q2TBzux2i YF62Q1KDidNq7rRQcRCXe69UlHmkZD64x14L2IT1f9mejQHd9fuHcMDIHUslXDtML6TG vgBkFTVb9MyDOIlvRkutL4XeS8JCVriWstU7UP+2YT57CCJ/uuKAE0iLWWpfkgN0dIqw 5AUZrvabFbcjKkXbWv99m4W8mPnj2E0L5mETwTfivfS1k5HIZRL75zTHwqMA6ZQCQgfm q4Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hnNTO5He; 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 e3si288626ejm.412.2021.06.08.11.59.39; Tue, 08 Jun 2021 11:59:40 -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=hnNTO5He; 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 S236257AbhFHTBZ (ORCPT + 12 others); Tue, 8 Jun 2021 15:01:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:60728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237120AbhFHS5Q (ORCPT ); Tue, 8 Jun 2021 14:57:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8AE2E613F4; Tue, 8 Jun 2021 18:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177740; bh=iq+OnzuHjjjIKLdJUOmHU1txjGZ6gPhhdHnQeA8Ec8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hnNTO5HeTlmWfuNM4pCOOJj9OjrSmnX8aQ8rwLA32Bx5a6Vj99AXE3ogO5WX4PKjr 6a3wWsrzx8L0uv5wB8Sr+01WKQARJZSLUVyEaXPbgzXfZDe+YOXmX/VZI8vAun1snm VeMh5rqDKdbactc0XxJhlIEwDm6KEV/zf3V+kWjU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Stefan Schmidt , Sasha Levin Subject: [PATCH 5.10 039/137] ieee802154: fix error return code in ieee802154_add_iface() Date: Tue, 8 Jun 2021 20:26:19 +0200 Message-Id: <20210608175943.738252732@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175942.377073879@linuxfoundation.org> References: <20210608175942.377073879@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 79c6b8ed30e54b401c873dbad2511f2a1c525fd5 ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: be51da0f3e34 ("ieee802154: Stop using NLA_PUT*().") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210508062517.2574-1-thunder.leizhen@huawei.com Signed-off-by: Stefan Schmidt Signed-off-by: Sasha Levin --- net/ieee802154/nl-phy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c index 2cdc7e63fe17..88215b5c93aa 100644 --- a/net/ieee802154/nl-phy.c +++ b/net/ieee802154/nl-phy.c @@ -241,8 +241,10 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) } if (nla_put_string(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)) || - nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name)) + nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name)) { + rc = -EMSGSIZE; goto nla_put_failure; + } dev_put(dev); wpan_phy_put(phy);