Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 17 Jan 2023 09:59:36 +0100
From:   Simon Horman <simon.horman@corigine.com>
To:     Doug Brown <doug@schmorgal.com>
Cc:     Kalle Valo <kvalo@kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Dan Williams <dcbw@redhat.com>,
        libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org,
        netdev@vger.kernel.org
Subject: Re: [PATCH v3 2/4] wifi: libertas: only add RSN/WPA IE in
 lbs_add_wpa_tlv
Message-ID: <Y8ZjeKeNx0eHxt7f@corigine.com>
References: <20230116202126.50400-1-doug@schmorgal.com>
 <20230116202126.50400-3-doug@schmorgal.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230116202126.50400-3-doug@schmorgal.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?g8blp8j6k8C89JmiBAF5G4FNee+VyTGsJztRgVkoHnpXr3f8EawGqVYR2HM+?=
 =?us-ascii?Q?bzBRv20FQhRYlAtzw53cQo3ojkEXpHAZES31eOEA2BBKBDva5L8BU5cwsb86?=
 =?us-ascii?Q?kx8V9MWzQlL8j7RgWeqLzB7Yemdt4x78O/WkVzaAPtM3IWJDes9TPheBJNVT?=
 =?us-ascii?Q?1a5B7LnknWh6bmDypwi9iBK9hozBnBVDB6NHdShQh+wMM5WDYPv1v7iNMe2U?=
 =?us-ascii?Q?hL4kUFDV7K5LVOG5VJR0fMLo6JdaEo+ZAk8xJ/U+9L5xq5+Inv8jLhpmNY+G?=
 =?us-ascii?Q?Gw0qDf0rYf2bceC7t6MWRlj0+CoQ3djcmLSs2doLvVfCPB+05LqOvEz3O7mQ?=
 =?us-ascii?Q?HXcAM6+0kUWtYvkuenYy3lf6lLrgarOxzHspPpQXs12mJAi1MZZIxPG95jtk?=
 =?us-ascii?Q?PUSnyt3FCfkqgWTuNDyddOoQ2wSJAtyPHoyu3sDfoZIBGv0s1eZcLVhVT69k?=
 =?us-ascii?Q?BegYmWea6QUR2i2qmzm4Jf/KiwJ5+ER27UfPM2BfL0NeW4URoIn4WugjbcHq?=
 =?us-ascii?Q?CexxrLRecgJW5rx9zDD+QcDd/JsG5vZ2b8ysItgO8vFh0R1B9M32xo00G9ag?=
 =?us-ascii?Q?FR+4xxE++d/OhPFGWFmwd8t/t1JKKkeWKwaRp9mx6gpXNWxQ2lqu2nzPO2FN?=
 =?us-ascii?Q?lpnOHIyf0TVwMoTZF6Q8YWATUiQXzHo0JSpt5D0WVY4KS0Dv4uUF5wnxPDBV?=
 =?us-ascii?Q?V8KHoyWBvzreRu0G/rCyXgBC8AZ3FR1MUSi+r0FF/DgTL3dT5IIoQOMmUBKu?=
 =?us-ascii?Q?U/F02bbPG+79FHPWNqanX4mfNZOwkkf8Un+1Am5plRB2hOMvMBuu5hY3V2cK?=
 =?us-ascii?Q?IAAbwnTVLyf/JMBoJj5vjgcimfMxbELG9OqMaDsn1g9NPv5Hq2beoaFZgeyp?=
 =?us-ascii?Q?n/MljP1vt+//yisj1zZIPUDV7NA7jrTUvQA6H5N3lRKKrUYGs0YPmXuKyYR+?=
 =?us-ascii?Q?yo7xQ4D4aEAvDfpYrmnMJ+gddcmdcAkmvAo6x8xmZhD8vv18FqcufYVjObeN?=
 =?us-ascii?Q?49jh37V5DbJS8zsQeF6oKW67k/dF8+EXokH3znMvPUqZ9iAlTm13EQL3+caw?=
 =?us-ascii?Q?andUd4IK6qXY4kfc+4o/q3cG+ZGX8gvtLWQosf7pSau0icPKVmKn8wQyOmQk?=
 =?us-ascii?Q?EwnJc58nNcFXZiODSeaUaCuokpoBXuRQygA7yn6rnSUk0abegTSg5dtsnl7U?=
 =?us-ascii?Q?5J7bFdoRnwNUzwRHeDe1S05WRVGCZZdtxE0ztNJTKrWjZJz0vOyUBbTPaN0A?=
 =?us-ascii?Q?kieXsPqNbDS49CSzwvc8SuxGd+J4/TIIBBQMQcd3ypzrKmVqkiDEOiDJkBRr?=
 =?us-ascii?Q?AL6j96mQtwaSfTjayHby3OYmbeCqbeUcYeALnRtm0vDfOYoznBiTw10heI9v?=
 =?us-ascii?Q?QhRTJCUy+IypnsmEYAwuj/wRLPImksob/vdw/Ri/wNXhggYiuRu/aRoqiH+T?=
 =?us-ascii?Q?YQl1sBA+ORTTPZw6Wa3czya7w/7Xuo3KavMfJUzBzs7h/g9Qx81jhkpbkr0O?=
 =?us-ascii?Q?oLzeD2eivuVuTuaHKhyzYuJdqL93gC2K36Vxb+NK0qeF+ad1CaR1R3oL8R7w?=
 =?us-ascii?Q?GrcAaxnBFSljWWLhFwz1rum67qBPQQH63I/w8eOpW7CccS9OXWCtdBbitsFz?=
 =?us-ascii?Q?E/Jq+KglzzO6g8Zsk0qGAoIhzNuSxw1uNnJafnMNORGI1Px8hAEc1E+kQgWr?=
 =?us-ascii?Q?y03dDw=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 10491783-affb-428d-56b7-08daf8692c7b
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 08:59:43.0225
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: I3mo/j2Vl3EhQ67wWqyA7dYKPOFMCpXX4i+9xeFtCo1OufLhxDanh0/sNU+OqV5MlEbqjm3zLCZjpBOQr4JJKJrHsnuaVPZujDupWGcpOUw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR13MB4647
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

On Mon, Jan 16, 2023 at 12:21:24PM -0800, Doug Brown wrote:
> [You don't often get email from doug@schmorgal.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> 
> The existing code only converts the first IE to a TLV, but it returns a
> value that takes the length of all IEs into account. When there is more
> than one IE (which happens with modern wpa_supplicant versions for
> example), the returned length is too long and extra junk TLVs get sent
> to the firmware, resulting in an association failure.
> 
> Fix this by finding the first RSN or WPA IE and only adding that. This
> has the extra benefit of working properly if the RSN/WPA IE isn't the
> first one in the IE buffer.
> 
> While we're at it, clean up the code to use the available structs like
> the other lbs_add_* functions instead of directly manipulating the TLV
> buffer.
> 
> Signed-off-by: Doug Brown <doug@schmorgal.com>
> ---
>  drivers/net/wireless/marvell/libertas/cfg.c | 28 +++++++++++++--------
>  1 file changed, 18 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/wireless/marvell/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c
> index 3e065cbb0af9..3f35dc7a1d7d 100644
> --- a/drivers/net/wireless/marvell/libertas/cfg.c
> +++ b/drivers/net/wireless/marvell/libertas/cfg.c

...

> @@ -428,14 +438,12 @@ static int lbs_add_wpa_tlv(u8 *tlv, const u8 *ie, u8 ie_len)
>          *   __le16  len
>          *   u8[]    data
>          */
> -       *tlv++ = *ie++;
> -       *tlv++ = 0;
> -       tlv_len = *tlv++ = *ie++;
> -       *tlv++ = 0;
> -       while (tlv_len--)
> -               *tlv++ = *ie++;
> -       /* the TLV is two bytes larger than the IE */
> -       return ie_len + 2;
> +       wpatlv->header.type = cpu_to_le16(wpaie->id);
> +       wpatlv->header.len = cpu_to_le16(wpaie->datalen);
> +       memcpy(wpatlv->data, wpaie->data, wpaie->datalen);

Hi Doug,

Thanks for fixing the endiness issues with cpu_to_le16()
This part looks good to me now. Likewise for patch 4/4.

One suggestion I have, which is probably taking things to far,
is a helper for what seems to be repeated code-pattern.
But I don't feel strongly about that.

> +
> +       /* Return the total number of bytes added to the TLV buffer */
> +       return sizeof(struct mrvl_ie_header) + wpaie->datalen;
>  }
> 
>  /*
> --
> 2.34.1
>