From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95A95C433FE for ; Fri, 17 Sep 2021 11:49:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78B536124D for ; Fri, 17 Sep 2021 11:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242099AbhIQLu4 (ORCPT ); Fri, 17 Sep 2021 07:50:56 -0400 Received: from smtp-relay-canonical-0.canonical.com ([185.125.188.120]:48114 "EHLO smtp-relay-canonical-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240718AbhIQLuy (ORCPT ); Fri, 17 Sep 2021 07:50:54 -0400 Received: from localhost (1.general.cking.uk.vpn [10.172.193.212]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id E0DF13F234; Fri, 17 Sep 2021 11:49:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631879371; bh=o1svmj9FW/O2TpubDpCCd4h+o8vOHM4Lf/k/ntltkBU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=TSh3v888gsqV6LgYPkJE5Vaus/eAXBbSz7yjRySiVtJGM296jgVE1E+f/PtzRSd6B nsMJ/0pedoPcNB8UIRHMImuR7EZwIpRLn0A4r1fODbMgRZjWI7xkd1ZOvt/hVld7uk N9PZIo2Vt5ICKhaY0ZoQxQsp5vwbYFUAAo5IrdzdaDjkGGYdOMdsWgJikMGLqMl2SQ lg9jPIFuuDUldswHMj3DtaWlspoBN18R8MRZAdqYj25f9lRSiOtKp5YjZWnPegdZrS 1TzvXKUdpuJJFWGbWos+L3ssb9MfAKr58l0jaIehyfms7rsHkXfRuFuRhqaAfrot3x IOxt9JZNt6x4A== From: Colin King To: Laurent Pinchart , Mauro Carvalho Chehab , Hans Verkuil , Ricardo Ribalda , linux-media@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][next] media: uvcvideo: Fix memory leak of object map on error exit path Date: Fri, 17 Sep 2021 12:49:30 +0100 Message-Id: <20210917114930.47261-1-colin.king@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King Currently when the allocation of map->name fails the error exit path does not kfree the previously allocated object map. Fix this by setting ret to -ENOMEM and taking the free_map exit error path to ensure map is kfree'd. Addresses-Coverity: ("Resource leak") Fixes: 07adedb5c606 ("media: uvcvideo: Use control names from framework") Signed-off-by: Colin Ian King --- drivers/media/usb/uvc/uvc_v4l2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index f4e4aff8ddf7..711556d13d03 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -44,8 +44,10 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain, if (v4l2_ctrl_get_name(map->id) == NULL) { map->name = kmemdup(xmap->name, sizeof(xmap->name), GFP_KERNEL); - if (!map->name) - return -ENOMEM; + if (!map->name) { + ret = -ENOMEM; + goto free_map; + } } memcpy(map->entity, xmap->entity, sizeof(map->entity)); map->selector = xmap->selector; -- 2.32.0