From patchwork Mon Oct 24 11:31:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp462692wru; Mon, 24 Oct 2022 06:46:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7TX0qfIbZBUXo2oXIC8N2A48g7RpY9u1BS0UP3fBZXJkeNzxDtxraANtbQpEPrkk5gWwGu X-Received: by 2002:a17:907:3f94:b0:78d:9d2f:3002 with SMTP id hr20-20020a1709073f9400b0078d9d2f3002mr27376193ejc.40.1666619183601; Mon, 24 Oct 2022 06:46:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619183; cv=none; d=google.com; s=arc-20160816; b=bj/3PEy11GSfRGl6coW4d34ii0q0hu7DNiOUHIpc8WU3DTPEWaJGC+c3JzxTcHhsjx Im3aWejEPr57GnOIWdENnQ0NwxkoNxCu/Z3BUswmRD/Yz7ki5UIODs4iXSPyEkAem8RI Vk/JbNN38EYGFsmDyFNwdv/uZfx+3sVB1MLUxy6Dv5Kye9aPrE31bRvPT/Q3jX2U2iZ9 6jfGGBZFYMnjYmIIrbdDx0P5/xwk2pkUyljJkTDS+ZWpRAXwOfM46KeqKGGuzFBOUphz fCQUdKsJQiCABS8YzBv34iPyUYZ6wCllH5Nc/Ukv50g3jTlUO0socQFxUmj1dsgOLXCw GU8A== 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=w+JeoqngnDIj22oFXTpwtF8uTj2pzFV8HLCcISlxjDE=; b=BvtVQr84VyaXXoAs2ol+XxWN5Maf5bKlk67++3iUQWKptS3xbIoN0VycV2HAsQBkEE 1nK3J/GU4XmDcfbjLy7asWeFE31LBg1rSXgPBQpTx54lmbeiiw8UKIdSaUivgqxmVoy4 RM7t2raFRmCBCkIX4HIWNwriOGiHUoxhp1Mhh2gMKLni+KCpQZXoC0yM/OBHDPinsGm3 lhWF/pQalYKsF8B5kQAN0iwGXGxgjb5QCUPSY3mGuCZisoy6M6Xmvt6us1LnJL9AGVMU zLjdDAqzYWq3zVyACgt3U5IbGQEpGZD4VK8fNDAZTbTymA4YkyM0XC+Au6LLmHk0+iIP Nh+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wBBMmZAC; 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 xg11-20020a170907320b00b0073d92f673f8si26780852ejb.937.2022.10.24.06.45.59; Mon, 24 Oct 2022 06:46:23 -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=wBBMmZAC; 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 S236316AbiJXNnk (ORCPT + 99 others); Mon, 24 Oct 2022 09:43:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236826AbiJXNlV (ORCPT ); Mon, 24 Oct 2022 09:41:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABE4EB48B6; Mon, 24 Oct 2022 05:38:49 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 41EAE61299; Mon, 24 Oct 2022 11:45:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57170C433C1; Mon, 24 Oct 2022 11:45:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611930; bh=nU5shlmlTDL+WA15wXTBEMZOu70bg3gompzMDfGsWu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wBBMmZAClAvStybg8EWqZr3VQXhudbj0/92XzjkvqVJRNsiuT35wmzbwYv2BQWsm2 oxMCv1UOS/dtmx1MqcsPYndQPodqC0tO29Re/ZIJXPIGComaOgAfqgZxY+g+X9rn/q rFNNtcwO+8ZvifOx6pRTmCDoXSGTlHBafn/QceZI= 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 4.9 154/159] net: ieee802154: return -EINVAL for unknown addr type Date: Mon, 24 Oct 2022 13:31:48 +0200 Message-Id: <20221024112955.046094901@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747576876940503346?= X-GMAIL-MSGID: =?utf-8?q?1747576876940503346?= 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 @@ -193,21 +193,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,