Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp6826499rwn; Tue, 13 Sep 2022 09:29:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6+jZEGJ+RVq3rdYwMNBbB/j6lTlMQmzRG5dcB2CMx/LXdIJHHcOxHghVf52lp3qsHx/gds X-Received: by 2002:a17:90b:180e:b0:202:e725:19e2 with SMTP id lw14-20020a17090b180e00b00202e72519e2mr87906pjb.163.1663086557972; Tue, 13 Sep 2022 09:29:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663086557; cv=none; d=google.com; s=arc-20160816; b=QoB3plgseS4OxuMR7bNT8HC6cdb/8klcYmJigJvwu192ww99qn+BqkI3a7EI16/RH/ bUyMVuzp3jYwPiaVNEVHMpkV7FNbAVFxbeKbYnDtek+cVKwXNmm2uKCM9h2UnLG9LBc+ zAvY1pkYci9ac1SLh7iK0ozu+kYPrDCr0kP47748jYC//j/D/RgffnlcpUUup/fsl7MS xj4qx/4Vd4wn8EOhoxiEnexR6CPJN4L80+CUkQ02ML6RHcYmSmb27XnY/cx28K4IpbJ4 yh2j/uFcYk65rr/RUp050LjmHLy33j9jyWbgPRzU3g8Ji28+NICdalSyoFOQx8m1XCzl ETuw== 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=Nex1ovrBnJJplqsXVJqouqezbX9UMF4FrnCPYfZCYHA=; b=eWzeTWaQK5vTm+UlS5WrTseYKRgcIDfgR/rnlRefEQf4GSL8ZvSInW+/cSSspcQQVf jyoP1vgmOqJMoYdmkfxLCbxZ0bwo4dXrSMyuH+/5QvutxdU/rfDlKgcFe8cUmIRvGG3s t3SMZsS9y00k3yGtKsRTADJofMQCMxxtRrJn/ySvAFI4wu4geBb9WHrWWiLFbc0cOWJ+ 44/kLSTIg7akMkekwVdbwtkdirxXDWa1j+GuEd54XBK6V2YtY8oX12gr6kk5G0Su5Yyl GEQzZ504AYCr0B+2z8iqpp5fuooc0OxgD28K4XKZmQp0eN+NkNaPUQlHkc6p1oPFfgW5 KQRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1d0bkPvj; 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 r27-20020aa7963b000000b005409c35fb2bsi10480170pfg.283.2022.09.13.09.29.04; Tue, 13 Sep 2022 09:29:17 -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=1d0bkPvj; 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 S236165AbiIMPZH (ORCPT + 99 others); Tue, 13 Sep 2022 11:25:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236044AbiIMPXC (ORCPT ); Tue, 13 Sep 2022 11:23:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C6697C74F; Tue, 13 Sep 2022 07:37:22 -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 D95BB614A3; Tue, 13 Sep 2022 14:36:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0DBFC433D6; Tue, 13 Sep 2022 14:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663079817; bh=AQoDADaLPKvNoQ0TH0wMcQHRuHBQaajr4jYWAN6BNKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1d0bkPvjE2YjukTE10guc1zs17mdJgCj0FgfN4VhVkRXSKoSyd7bb3pGv1UJ7Olwv 4GiFGLq20WX7Jn++8zclW3fcQwZpRHricRmmsy48AuWxnoQNyBFSgqKVPEYXaUXgJ1 /cIxdHJ4/aN0LQqIUJY7mClY6UdNajTMDNAub2/8= 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 4.9 05/42] staging: rtl8712: fix use after free bugs Date: Tue, 13 Sep 2022 16:07:36 +0200 Message-Id: <20220913140342.516250467@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140342.228397194@linuxfoundation.org> References: <20220913140342.228397194@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 @@ -128,34 +128,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; @@ -224,14 +196,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;