From patchwork Mon Oct 24 11:32:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp615854wru; Mon, 24 Oct 2022 12:27:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Wruj6o/7a+aQz28A6F4fWZTBAkl4TLCPzxuRzvWKCpfIl0aqRwVe6UAWYpfvUn13eAJNA X-Received: by 2002:a17:907:7632:b0:7a1:d4f0:e7c5 with SMTP id jy18-20020a170907763200b007a1d4f0e7c5mr10859733ejc.160.1666639642700; Mon, 24 Oct 2022 12:27:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666639642; cv=none; d=google.com; s=arc-20160816; b=NxAKjb0tUkUWXHaJVs7xmSo2jP4v5lncVdIuSpCciZGZ/nLo8xhnPtzEqmLw3Irm+I Y4PRLJMAi78uXH5okQihqmqua7LNy29C88u3zbIF5aJsm2UGraW5fKdPx8Qz+aiuzLAl 3Y+LsOpCeVejAoTxMru//hYYmXJxQUbPIFbXzJaaQ6vw1zb70bmhr+B86OINtJ35XJuH CC8ZCWVXz5uWx9wzb5BaycKX7w1juwuwsiZ2CHIn2Tb9ELiVHlzWkaJ/PGY50FWury+S zJoWfyFJd2nJ60yfA6KFvcb5mHecEECyp0OcrvI3+6P1R9OPe6pkZet/C3UOuww5jSMs 4sOw== 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=gbCdJqhC/p7TIdq+qgmHmqp0p5N1FFC0pL42yEckEyA=; b=AIQ4P3eUeSSZGK2aYuOvd8bDTUL7RCTgj6987eS4s4CxlanWw85Er2p0GyfZhQRgdJ mziJ6cqk88iGdfkswzhGdo5k1VOcJwbq/+zUFF+sl4JRpoYaJykpdZn2PcEEXWwsXyYY V5XyjqwVCd8+Eh3eruH3Wv9QbesJo9tKpzPlACT8+9hmU4HPJnMkOtBeOMo6FACzolv7 7yiv5+GuhNCXWm475BgREEhvoMddNeMLLRf5x9KnAHreDwamxXznmuQ18mszXOWuRkvh xccrkeYBMWWJexnvdM2rmiTDgVpoz38kaAdEI/0ss4jMqlo+uOzj0hG7pnfFArzg+3Mk 7Fow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DDX6FhU7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y6-20020a056402270600b004615c5728e8si675270edd.494.2022.10.24.12.26.58; Mon, 24 Oct 2022 12:27:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DDX6FhU7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S232354AbiJXTZS (ORCPT + 99 others); Mon, 24 Oct 2022 15:25:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232520AbiJXTXE (ORCPT ); Mon, 24 Oct 2022 15:23:04 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA21C29C; Mon, 24 Oct 2022 10:57:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 688DCCE1345; Mon, 24 Oct 2022 12:33:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 693AEC433B5; Mon, 24 Oct 2022 12:33:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614798; bh=OjZ0L2KyAgkZPt75DZB7YHk9PytepHMPjogVsy2mw0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DDX6FhU7l0QX2G5OUh6WYgz3iyuXEInm/7K+jhHZslTUxRRV4iJ17AJLqQ1bApjGD 63bNkVJFyt7twku02t2R3KecHGDhF9skoGpdBqYCxbtjK9ANODuKonfdTRPSoNw9IH eeuQzI/kpyk6UnCxOP2Vks+NfT3jMp5BEBYojLx8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Aring , "David S. Miller" Subject: [PATCH 5.10 381/390] net: ieee802154: return -EINVAL for unknown addr type Date: Mon, 24 Oct 2022 13:32:58 +0200 Message-Id: <20221024113039.197309148@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747598329913024136?= X-GMAIL-MSGID: =?utf-8?q?1747598329913024136?= From: Alexander Aring commit 30393181fdbc1608cc683b4ee99dcce05ffcc8c7 upstream. This patch adds handling to return -EINVAL for an unknown addr type. The current behaviour is to return 0 as successful but the size of an unknown addr type is not defined and should return an error like -EINVAL. Fixes: 94160108a70c ("net/ieee802154: fix uninit value bug in dgram_sendmsg") Signed-off-by: Alexander Aring Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/net/ieee802154_netdev.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/include/net/ieee802154_netdev.h +++ b/include/net/ieee802154_netdev.h @@ -185,21 +185,27 @@ static inline int ieee802154_sockaddr_check_size(struct sockaddr_ieee802154 *daddr, int len) { struct ieee802154_addr_sa *sa; + int ret = 0; sa = &daddr->addr; if (len < IEEE802154_MIN_NAMELEN) return -EINVAL; switch (sa->addr_type) { + case IEEE802154_ADDR_NONE: + break; case IEEE802154_ADDR_SHORT: if (len < IEEE802154_NAMELEN_SHORT) - return -EINVAL; + ret = -EINVAL; break; case IEEE802154_ADDR_LONG: if (len < IEEE802154_NAMELEN_LONG) - return -EINVAL; + ret = -EINVAL; + break; + default: + ret = -EINVAL; break; } - return 0; + return ret; } static inline void ieee802154_addr_from_sa(struct ieee802154_addr *a,