Received: by 2002:a05:6358:489b:b0:bb:da1:e618 with SMTP id x27csp6771473rwn; Tue, 13 Sep 2022 08:49:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR4+12XZ9Mgb3rpg1pumYDC/dfYQA0F5+2TLGk2dgvgHFION6ymvbwRjjT5WpnZeHlnddDN2 X-Received: by 2002:a05:6402:4449:b0:445:cdb6:2de9 with SMTP id o9-20020a056402444900b00445cdb62de9mr26793454edb.59.1663084144637; Tue, 13 Sep 2022 08:49:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663084144; cv=none; d=google.com; s=arc-20160816; b=hHUcY5kqfhjxLqJA3k+mXvVXECoImxDGKkV8HP/q8oyJyaBFH7ruE7rkAVJuHPFnYj Rz08pj/qOCew0Bu7abXgx8VWEL07vX8nAFrPfozBvEsykwseKmeRl7cZQdMNcAS8TGDo aZj0b25N+QWlDc5eeVGGJxyHmLQtL/cW0wI/m2kHBnhtWc8626pOD8cQqpHEYX3UOcVH GV8P75hMyZJxPhZV1TjjRVjwZX8UeHYyx4MwLr/pVCeBxDTp3fgH5ciJsvvKWstI9whD Ejr+iJtmHzA7poH6YFFeD/z0KXeP/optfHLY233lcXLt0W6mOtmq2/6Y0OhdpTzPV0uh x2yA== 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=hINeSUw178NvtzNxzv9jvkUPbwD49jGmCMeKTD6d2aQ=; b=pNMB7UqrWC8kS9tw0ha8GEEL3mekyOHJvZ9ORsw3o62YcWZWKOC4TULnwLraM0glIZ QvwARwbM5932r2QX5OJ2JKFGLwJ3FSUaEA/TyzDxf/uo4cZamaL//xKo7bblp3DTssWK b6C6JyM/dN+XahkuA1F2gp34Mla12snLuz4LtGvtfahe/R0tahLzjqHbA0G8AUxHkDL+ ftG7WrzmbGDpgEKaSPyhaD6ZkC0xJ3vXbXQW5tEe3/XGRq6Wmg18c3fF1YPPhx3YjQiF /mdKpX7fI546ux2uoqnTEV0qu4iLujwcr57nrkx+PQKsI1FbJqf1bF3Dty/b4CY/cm40 YUDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="a/jbgOyA"; 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 m16-20020a056402511000b0045093559f1dsi10396639edd.509.2022.09.13.08.48.36; Tue, 13 Sep 2022 08:49:04 -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="a/jbgOyA"; 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 S232280AbiIMP0X (ORCPT + 99 others); Tue, 13 Sep 2022 11:26:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236244AbiIMPX5 (ORCPT ); Tue, 13 Sep 2022 11:23:57 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE3F77C773; Tue, 13 Sep 2022 07:37: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 ams.source.kernel.org (Postfix) with ESMTPS id B21E8B80F91; Tue, 13 Sep 2022 14:33:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F03BC433C1; Tue, 13 Sep 2022 14:33:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663079621; bh=6QeIICB9afA+06gQQvIaQmzK9vuCVqdguqf5PTujeGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a/jbgOyAi9a177hgx8wi3vvZXMcIh1cBuOLRMZnYQ7Q8aeiQLOxIFzO6f57uXJELy SZNqvXTJGkQap1cdw10yT9G1rf671NBCh5kOeL0/1WXJfuUoVDIByREe7kZ5SjnM8T QEZzFp59oyL1PAbDSyy6HsLNS3oypeIKUJ7NYZi0= 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.14 10/61] staging: rtl8712: fix use after free bugs Date: Tue, 13 Sep 2022 16:07:12 +0200 Message-Id: <20220913140347.002041437@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140346.422813036@linuxfoundation.org> References: <20220913140346.422813036@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 @@ -129,34 +129,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; @@ -225,14 +197,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;