Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp6760746rwn; Tue, 13 Sep 2022 08:40:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR64ioUdv7RL4tZoHmR4IMY46PH14EZrhAAy5K9NGRFoG52CZCqjFy9DX7ZkjN3nixubkLGJ X-Received: by 2002:a17:906:fd86:b0:777:d739:1ede with SMTP id xa6-20020a170906fd8600b00777d7391edemr16757664ejb.576.1663083619160; Tue, 13 Sep 2022 08:40:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663083619; cv=none; d=google.com; s=arc-20160816; b=Uw2O9xjuIIQJ3mH2fxHoGAzG8XwnS+iYMfAKaW4PsQUEcXx98XNfZfAdRzkWjQcAmL Kjobp6xWCUrI3ZITllr7bQMS72jifNftWi+U/vn4IKdR9umKqLjy8jgbenTM769js7a9 ZHs3CBJs37b9IxuAvD2Za+hugTmynRZE58F8d1agJtgHAK0dAxO9wJ7CVV4pzsPRB1GX W1d4YiukuVqet7CS/QI7OFJgGpPdEuCG2cN2rLXix0iaalS4C/WJqrhu7Lo+jcjc1pvG /MvTymM/TzgowKiSxjZe26tNGoRPPfZlZaJAUycIaIXrSK/V7j9qYG5UN6TgNLB0lOM9 HyBw== 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=1k9GKoUQlUASaXKJ2bONsbqiBm8JDKlzxxps7y2WLiI=; b=he7PyLh5EtInwwRhR35su7qgl1NMYFts/zyWW2JqM7TihdbO7z7OcYTK+wzY7tb3Iv ES3SqEImaGNx/gIHrIFvzsPng2/VQTlhH3HRWENqnBc93j8xF2gFJWlsW0TgGHVoOLku b7PcqxRcHEEb6jAwDRnVfwC+vY0+cXUfSFy5e/5sy5Kgc+W+mt/RzRFO1fmHgZ47sTr8 zu7ZzYAFvwh3fDM3QgkrBWc7ByUkyW/aX0dD8d9FsH/9RAdiBVSsCjOTuyCAPgLA5tW5 YnUNLdfFOcMusSOpTObxryVBnmJYpeOH2cySjEF/9vaysJ/wiGq7CxOlV4Zd8F2onvVv mh8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Nryfx7Ln; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p4-20020a170906604400b007309350f2f9si8886245ejj.555.2022.09.13.08.39.53; Tue, 13 Sep 2022 08:40:19 -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=Nryfx7Ln; 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 S234988AbiIMPAG (ORCPT + 99 others); Tue, 13 Sep 2022 11:00:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234814AbiIMO6Z (ORCPT ); Tue, 13 Sep 2022 10:58:25 -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 75FC86745C; Tue, 13 Sep 2022 07:28:19 -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 7CFCF614C1; Tue, 13 Sep 2022 14:25:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EB9CC43470; Tue, 13 Sep 2022 14:25:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663079150; bh=jCbiulv3+SkkRMqoeGCKxedOr2kOBhDnFPmxoCl8K/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nryfx7Ln5eocPhGWMBgrj5DVsOuwweRYpXWBcvX9Eaps2Yrs79NdTWVbcruU6gets EN/8xFRR7QR9qArZ51EuOmRDSsVvmbLlspDRHspRN+3KvED/wxwyCC6k1sj4Z4vYSQ 6b2kOrovD94GH7/44hYYFnlIDA82URVJFwVAXHok= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable , Zheng Wang , Dan Carpenter Subject: [PATCH 5.4 022/108] staging: rtl8712: fix use after free bugs Date: Tue, 13 Sep 2022 16:05:53 +0200 Message-Id: <20220913140354.574216851@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140353.549108748@linuxfoundation.org> References: <20220913140353.549108748@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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,T_SCC_BODY_TEXT_LINE 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 From: Dan Carpenter commit e230a4455ac3e9b112f0367d1b8e255e141afae0 upstream. _Read/Write_MACREG callbacks are NULL so the read/write_macreg_hdl() functions don't do anything except free the "pcmd" pointer. It results in a use after free. Delete them. Fixes: 2865d42c78a9 ("staging: r8712u: Add the new driver to the mainline kernel") Cc: stable Reported-by: Zheng Wang Signed-off-by: Dan Carpenter Link: https://lore.kernel.org/r/Yw4ASqkYcUhUfoY2@kili Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8712/rtl8712_cmd.c | 36 ---------------------------------- 1 file changed, 36 deletions(-) --- a/drivers/staging/rtl8712/rtl8712_cmd.c +++ b/drivers/staging/rtl8712/rtl8712_cmd.c @@ -117,34 +117,6 @@ static void r871x_internal_cmd_hdl(struc kfree(pdrvcmd->pbuf); } -static u8 read_macreg_hdl(struct _adapter *padapter, u8 *pbuf) -{ - void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd); - struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; - - /* invoke cmd->callback function */ - pcmd_callback = cmd_callback[pcmd->cmdcode].callback; - if (!pcmd_callback) - r8712_free_cmd_obj(pcmd); - else - pcmd_callback(padapter, pcmd); - return H2C_SUCCESS; -} - -static u8 write_macreg_hdl(struct _adapter *padapter, u8 *pbuf) -{ - void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd); - struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; - - /* invoke cmd->callback function */ - pcmd_callback = cmd_callback[pcmd->cmdcode].callback; - if (!pcmd_callback) - r8712_free_cmd_obj(pcmd); - else - pcmd_callback(padapter, pcmd); - return H2C_SUCCESS; -} - static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf) { struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; @@ -213,14 +185,6 @@ static struct cmd_obj *cmd_hdl_filter(st pcmd_r = NULL; switch (pcmd->cmdcode) { - case GEN_CMD_CODE(_Read_MACREG): - read_macreg_hdl(padapter, (u8 *)pcmd); - pcmd_r = pcmd; - break; - case GEN_CMD_CODE(_Write_MACREG): - write_macreg_hdl(padapter, (u8 *)pcmd); - pcmd_r = pcmd; - break; case GEN_CMD_CODE(_Read_BBREG): read_bbreg_hdl(padapter, (u8 *)pcmd); break;