From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51CD52CA1 for ; Fri, 7 Jan 2022 10:36:36 +0000 (UTC) Received: by mail-ed1-f48.google.com with SMTP id m21so20659073edc.0 for ; Fri, 07 Jan 2022 02:36:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CfP3gmv1Q7HUVGnEeNqV+K84WsivcSZYZ8kexJOYm58=; b=hotIENNn/JBp3WvMcltnuAjEai6Vr/7EjnKXvgP0MKulZEmBaBMoQ6FVSt1BGP+Uxc 36tMGwUPtiSpF2nM6qVTk0L1Mi+AxI8C2J1aygQRY7jeLFxP6mtNwfvJx1t7sSectWM1 dF0esgp4gHabIckVnw9iM0JAYdhD9HZdXytGm7ZwEzeXBBI6jmBIg+Iy1Rg4Vqw9w7u1 HgS/dCsjiApx3OtTbiYsdvetQ+K4TTEwvvNNRe2ly/vgdX3jTKx5dSKWhwJdZApvn0xO w+M0NaC6YfKaNnHwRnfdEGcb8Ya7NN2f+VF1I+OU6g7C0M1Vt6W0o/8ulhIvUU960qgT qGCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CfP3gmv1Q7HUVGnEeNqV+K84WsivcSZYZ8kexJOYm58=; b=LoSLEqKR7BCjfZZRB9ntUM3PxZ30KtZOpx93mNGFdKjrCrG4KzF/WcbXqfqxwP6hAg 1OCbXVop92Jyfju+O3x6DXpPdUQ1efGSvNCRYX5t70JKXdFHGri8z35+FUlz+qDZxao6 1TSva3hDMBryt7tIU9vqYGj7YBXR+1dvHuwy5vEhdUgIHpkN87Iv68biVmZobXRIpaOY DA+IRVXkLXY0CfNVxRQgF8H2JxFHR2amxxsj9B1RSFnzbtnXYxKH4LYqX9DloCXCuCY6 n6K8c8Egsfsb9Tw0Y0dKLiuEnLJXNU7i4pPZZlhj/KHdVLkyhvN8nq0aWB/fqHJnmWG4 pUyg== X-Gm-Message-State: AOAM531kecRU5nuGPjxiMMl5761PMOMryPeUpfMoAoMQLlg8W3kSU8rS xIiZeHzkJ1vWwJdmi1nVt2k= X-Google-Smtp-Source: ABdhPJwL5PfDscG+CG6dwqKJUsHmP6pN1FsbvPCQ8T92tXW/X6XcetH1zn46rdv0Dugxbzz4Qk5tiQ== X-Received: by 2002:a17:907:9808:: with SMTP id ji8mr50734068ejc.476.1641551794822; Fri, 07 Jan 2022 02:36:34 -0800 (PST) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::51e2]) by smtp.gmail.com with ESMTPSA id v8sm1869857edt.10.2022.01.07.02.36.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 02:36:34 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 09/19] staging: r8188eu: use kmemdup instead of kzalloc and memcpy Date: Fri, 7 Jan 2022 11:36:10 +0100 Message-Id: <20220107103620.15648-10-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220107103620.15648-1-straube.linux@gmail.com> References: <20220107103620.15648-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use kmemdup instead of kzalloc and memcpy in load_firmware(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 7 +------ drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c index ee684b37ff91..f7ae2fc0d2b9 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -525,18 +525,13 @@ static int load_firmware(struct rt_firmware *rtfw, struct device *device) ret = _FAIL; goto exit; } - if (fw->size > FW_8188E_SIZE) { - ret = _FAIL; - goto exit; - } - rtfw->data = kzalloc(FW_8188E_SIZE, GFP_KERNEL); + rtfw->data = kmemdup(fw->data, fw->size, GFP_KERNEL); if (!rtfw->data) { pr_err("Failed to allocate rtfw->data\n"); ret = _FAIL; goto exit; } - memcpy(rtfw->data, fw->data, fw->size); rtfw->size = fw->size; dev_dbg(device, "!bUsedWoWLANFw, FmrmwareLen:%d+\n", rtfw->size); diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h index 3da04751f25d..051f3b9fe726 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -35,7 +35,6 @@ #define PageNum_128(_Len) (u32)(((_Len)>>7) + ((_Len) & 0x7F ? 1 : 0)) /* download firmware related data structure */ -#define FW_8188E_SIZE 0x4000 /* 16384,16k */ #define FW_8188E_START_ADDRESS 0x1000 #define MAX_PAGE_SIZE 4096 /* @ page : 4k bytes */ -- 2.34.1