From patchwork Tue Jun 8 18:26:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 455795 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp4002147jae; Tue, 8 Jun 2021 11:37:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzuXsmff8O+fiitl2zaQkoGyH08Ee17x+NscvhnKUIU6FnF3lRUjdCnsHn1OHulqRJS0vg X-Received: by 2002:a17:906:a203:: with SMTP id r3mr25337443ejy.361.1623177442157; Tue, 08 Jun 2021 11:37:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623177442; cv=none; d=google.com; s=arc-20160816; b=s+5+HcTz3wTtj6hPliJgHpT0FHP3qwjpi6mx7s/dFmU6CpW1VcB+UJKyqGBX3CRgSh iHPFjPAZynOmz8QXHG0W48MPBOdeZatVprRddJYBSLHYiH45DADA1Bz/FyGHlC3hxggQ hTOYt0uR0cP2P2YZJ7o4A88ixWSXy0CZWoRmpvBI+lHm3hk0mPKHrHjtrGmRT2b0vRPx scoC2vm00R4Rbix0FiHrf3brvcCQw3nzaKH9pqROM6nm9XP/aTbqYJmUd3HWFaEv8jL2 Gb+YG9cCiW8lEqSsuMW+UqAT8J2EweAvpGfO9wSVoUwRgm+oR6Ev3oxht+0IJrcRcTuJ C1JA== 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=YAnNRB32F9NGMOhs204revalaFWjMt/ahEfTpLt7tcU=; b=J6cZrYmHRS1phuACl0zq3/JdlAsLcqroMxA/B8V+jg7GKOvo+aKjuDReYTBJ0DEXKk /Mxe8geZJjPvptUnjguj7xiUl9ZVbwNgWiQc5qNzTsDP6CWQ8HFf8jHTJtrXYOCou9UG zG4K3n1aN7+gjJU4wvJpdLXZk0HrngBYpIBavwlSgKTvbPnBiVVZn1WL9ltpN7o2VG81 x++72F1oyMEM6KtyelGPkdX6N76H+YmxNNPiBiOdn9zcg8TRV9kj6vZhixC+3iHFtgAC Mxqawf5HzhwxzAQjBramOEO3WHFTYeOBQ1CnM9gt/+phmpqStc9xBnk79qGmAH5hRte7 GUQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xU8pfEMm; 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 e17si368537edq.196.2021.06.08.11.37.21; Tue, 08 Jun 2021 11:37:22 -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=xU8pfEMm; 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 S235037AbhFHSi2 (ORCPT + 12 others); Tue, 8 Jun 2021 14:38:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:34878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234350AbhFHSg2 (ORCPT ); Tue, 8 Jun 2021 14:36:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 620D6613E1; Tue, 8 Jun 2021 18:32:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177157; bh=5vTC6qkIRrpHNelYHeJL8pniOFg1DPsjjOyVMCGUroQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xU8pfEMmhO53ubkQMVnjvMBPzjBy0IPEi6bX4J1GehJpSB8lPLf3+zZqq3XBpe7Bl 9UFiDyluPy1QWIqEboOwx6atd8oPG/0vNupxwdPG/NzNi2PFM2ZIa/om/fhOq1dbs3 55cUQ40QQo6/wPbL1qZ5+w2YQgt+h7eXEtLMEbV8= 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 4.14 11/47] ieee802154: fix error return code in ieee802154_add_iface() Date: Tue, 8 Jun 2021 20:26:54 +0200 Message-Id: <20210608175930.849166357@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175930.477274100@linuxfoundation.org> References: <20210608175930.477274100@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 dc2960be51e0..6a7fe415d5f4 100644 --- a/net/ieee802154/nl-phy.c +++ b/net/ieee802154/nl-phy.c @@ -249,8 +249,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);