From patchwork Tue Jun 8 18:26:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 455784 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp3994250jae; Tue, 8 Jun 2021 11:30:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxx00PQYoLNM/dcdJH8l37Krz8RJdPknI02Tj8zI0BDKH85lwYgry2qXEYSl5bDXl8wdbsj X-Received: by 2002:aa7:d64f:: with SMTP id v15mr26486339edr.255.1623177019494; Tue, 08 Jun 2021 11:30:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623177019; cv=none; d=google.com; s=arc-20160816; b=UMf2SHmGHdJrV1jNB8+Pk2JRUpC3ULU2dZ19WeVgDEAZ/HaY4VJ1FvVaSDbl1CJ2qa 1bg5M6ICPms3YKGgVi/8bLujsgUSOh1cXFrQ3Bs4o/noGfsox5a0qzu1qKwk2V4YQ72d fBX3jlVQ5X7I/UF8ksV6ZbFVKJ6QZfgR45tTAiunT3f7F3MWn+FbrylY2amGU5J3JrUJ LWqrWLZbiVESWAi2noPHiz4l6XLQAF2aVygAs4r6kMtfdunmxWoONCbHg0SNow6X3WRY zbvj57BmcRrntwiqcpNCnaxPEPC8vOpw642Lday2As8vz0w8NaqpwHk6F7taDEePr5SQ 2PoQ== 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=fQlo6ak4GDGJ0MEacg3BDQ2NACjQKOPvwxbcAQUOB3E=; b=jH+8gO5xZDRsWOekC5pAePYBac4b11yrFzSBluDc7UehZFskYrquyuyq2QRVhczu/v aHqPkSzwKF+KeKwkfM1Ll94JQtB2nbpsNGhaBQqDUgFgetiMycgJlnQt1PbvE/JrC15X 9+uG01YpwQ5p9QQ/I6kLIHRQnufapjtKUDPkaClTmGdzSqBQnIF7dFFQYx4/nvq9Xu8Z 8sd5Uoc3e7h+33ElqQEYb4gCCGOEQkSYtHG65QjPuW3/H3LG576PKo33Vfl7+LFV0SHz JuYh+9X17mWjHHpcu6ZbwJcD8VMR7rKCCyfKUILK36m2pmx9psAaUcBReWo9ucJOc1vl JXdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Vp7BR5AT; 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 e17si416787ejm.271.2021.06.08.11.30.19; Tue, 08 Jun 2021 11:30:19 -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=Vp7BR5AT; 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 S234079AbhFHSbE (ORCPT + 12 others); Tue, 8 Jun 2021 14:31:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:55882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234047AbhFHSbA (ORCPT ); Tue, 8 Jun 2021 14:31:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3D63961380; Tue, 8 Jun 2021 18:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623176947; bh=cq+BDAlz6yVWbPDX5SFSPBUVhukvOyz3I7Ra/jMwicA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vp7BR5ATi7ASXlvAm6lGReEU36zKnbGK/Gz+gQWdwIzBl4nGkBmisG/j9FoKnR4qh S8JgT+DYVzzVBV8EohGkM5kNxeeSy1+ZWC27D/7twIQ1ok0r6irAr7bE8d6b2/BLQD 0+8LPlXSewAkn06nmcWhz0BWIgYzojtDQ9euRmP4= 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.4 07/23] ieee802154: fix error return code in ieee802154_add_iface() Date: Tue, 8 Jun 2021 20:26:59 +0200 Message-Id: <20210608175926.783295651@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175926.524658689@linuxfoundation.org> References: <20210608175926.524658689@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 77d73014bde3..11f53dc0c1c0 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);