From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 378A42BE7A7 for ; Thu, 28 May 2026 18:17:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.97.179.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779992256; cv=none; b=GYVor5CJgn00mfUIaR6Meo9gzMr+06WaD5zfwGq7HP8bDEyo5HIBrwpk34y45akmhuZtV9d7BN4iy8dqEPj3h/pqwfx67oz7LadEMBcVlI1p/biIeqbptw1lE37aSaCH16zqL/rVDtAMiFPRo/KLRPedNf2i+kDce3ZInp8ZrSk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779992256; c=relaxed/simple; bh=hG8pKLMlHHx84BYHSCIAGgfR3AvF7MNx5/SsJkreRl0=; h=Message-ID:Date:MIME-Version:Subject:To:References:From: In-Reply-To:Content-Type; b=q4pClATdqoMDQbTWb/bAub0jQT/0tHqpwlfG7JBj+Q4qKSEgVJjWw9dh8ReZ7mn6p8qRJWmelcrHC/3etBQetKtjqaRkNKas63V+nFwhjfyNWvGZtcqWpRMDoHBwoOhGeGInHok/RzRrDyiT+xvRBgd7cXLZBn0LJ8A8YBJXsW0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com; spf=pass smtp.mailfrom=igalia.com; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b=hLbCWQYQ; arc=none smtp.client-ip=213.97.179.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=igalia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="hLbCWQYQ" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To:Cc: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=s8U0TWaHRbGw99vUtJyKsaSyf024e+RdhkE49rSK4lY=; b=hLbCWQYQr+0j3PduS/CE4Cjkn5 sm+T2czOdycUXytPoDCh9DnRij5/hBpD7WGvuKkLd7YY+LzBkxkg5zAY0iBSVKv8Z4UVfU74Z8NXF 3ijljzyfnBjGXkssFN43EKqMgitjCsvY/Lkhsww9Vf5Kj6w9g4+LJTWxLyXErYBQPzUC9zmtQI595 qhGHUPbWU634MgZS4jucoY42U3yJp19NGksHGcw0eVZyW0Al4Se5y/HP/XamaTJCApvyzRnUwY0pD 6qEoMs1CK27GNcaD9dYEzJFLi/cRlXSOLj3/+ykUh0VeXi2G5GOf9YhXTua75uKgmrV+NAZ3M0Od+ 1uaTF7Gw==; Received: from [189.7.87.67] (helo=[192.168.0.2]) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_128_GCM:128) (Exim) id 1wSfI8-009UqY-M8; Thu, 28 May 2026 20:17:12 +0200 Message-ID: <2b602ec6-d563-4fa0-a0c5-89b97a46abf9@igalia.com> Date: Thu, 28 May 2026 15:17:03 -0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] drm/vc4: fix krealloc() memory leak To: "Alexander A. Klimov" , Maxime Ripard , Dave Stevenson , Raspberry Pi Kernel Maintenance , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Eric Anholt , "open list:DRM DRIVERS" , open list References: <20260526184105.18962-1-grandmaster@al2klimov.de> <20260526184105.18962-5-grandmaster@al2klimov.de> From: =?UTF-8?Q?Ma=C3=ADra_Canal?= Content-Language: en-US Autocrypt: addr=mcanal@igalia.com; keydata= xsBNBGcCwywBCADgTji02Sv9zjHo26LXKdCaumcSWglfnJ93rwOCNkHfPIBll85LL9G0J7H8 /PmEL9y0LPo9/B3fhIpbD8VhSy9Sqz8qVl1oeqSe/rh3M+GceZbFUPpMSk5pNY9wr5raZ63d gJc1cs8XBhuj1EzeE8qbP6JAmsL+NMEmtkkNPfjhX14yqzHDVSqmAFEsh4Vmw6oaTMXvwQ40 SkFjtl3sr20y07cJMDe++tFet2fsfKqQNxwiGBZJsjEMO2T+mW7DuV2pKHr9aifWjABY5EPw G7qbrh+hXgfT+njAVg5+BcLz7w9Ju/7iwDMiIY1hx64Ogrpwykj9bXav35GKobicCAwHABEB AAHNIE1hw61yYSBDYW5hbCA8bWNhbmFsQGlnYWxpYS5jb20+wsCRBBMBCAA7FiEE+ORdfQEW dwcppnfRP/MOinaI+qoFAmcCwywCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQ P/MOinaI+qoUBQgAqz2gzUP7K3EBI24+a5FwFlruQGtim85GAJZXToBtzsfGLLVUSCL3aF/5 O335Bh6ViSBgxmowIwVJlS/e+L95CkTGzIIMHgyUZfNefR2L3aZA6cgc9z8cfow62Wu8eXnq GM/+WWvrFQb/dBKKuohfBlpThqDWXxhozazCcJYYHradIuOM8zyMtCLDYwPW7Vqmewa+w994 7Lo4CgOhUXVI2jJSBq3sgHEPxiUBOGxvOt1YBg7H9C37BeZYZxFmU8vh7fbOsvhx7Aqu5xV7 FG+1ZMfDkv+PixCuGtR5yPPaqU2XdjDC/9mlRWWQTPzg74RLEw5sz/tIHQPPm6ROCACFls7A TQRnAsMsAQgAxTU8dnqzK6vgODTCW2A6SAzcvKztxae4YjRwN1SuGhJR2isJgQHoOH6oCItW Xc1CGAWnci6doh1DJvbbB7uvkQlbeNxeIz0OzHSiB+pb1ssuT31Hz6QZFbX4q+crregPIhr+ 0xeDi6Mtu+paYprI7USGFFjDUvJUf36kK0yuF2XUOBlF0beCQ7Jhc+UoI9Akmvl4sHUrZJzX LMeajARnSBXTcig6h6/NFVkr1mi1uuZfIRNCkxCE8QRYebZLSWxBVr3h7dtOUkq2CzL2kRCK T2rKkmYrvBJTqSvfK3Ba7QrDg3szEe+fENpL3gHtH6h/XQF92EOulm5S5o0I+ceREwARAQAB wsB2BBgBCAAgFiEE+ORdfQEWdwcppnfRP/MOinaI+qoFAmcCwywCGwwACgkQP/MOinaI+qpI zQf+NAcNDBXWHGA3lgvYvOU31+ik9bb30xZ7IqK9MIi6TpZqL7cxNwZ+FAK2GbUWhy+/gPkX it2gCAJsjo/QEKJi7Zh8IgHN+jfim942QZOkU+p/YEcvqBvXa0zqW0sYfyAxkrf/OZfTnNNE Tr+uBKNaQGO2vkn5AX5l8zMl9LCH3/Ieaboni35qEhoD/aM0Kpf93PhCvJGbD4n1DnRhrxm1 uEdQ6HUjWghEjC+Jh9xUvJco2tUTepw4OwuPxOvtuPTUa1kgixYyG1Jck/67reJzMigeuYFt raV3P8t/6cmtawVjurhnCDuURyhUrjpRhgFp+lW8OGr6pepHol/WFIOQEg== In-Reply-To: <20260526184105.18962-5-grandmaster@al2klimov.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Alexander, LGTM, but a small styling nit: On 26/05/26 15:41, Alexander A. Klimov wrote: > Don't just overwrite the original pointer passed to krealloc() > with its return value without checking latter: > > MEM = krealloc(MEM, SZ, GFP); > > If krealloc() returns NULL, that erases the pointer > to the still allocated memory, hence leaks this memory. > Instead, use a temporary variable, check it's not NULL > and only then assign it to the original pointer: > > TMP = krealloc(MEM, SZ, GFP); > if (!TMP) return; > MEM = TMP; > > Fixes: 6d45c81d229d ("drm/vc4: Add support for branching in shader validation.") > Signed-off-by: Alexander A. Klimov > --- > drivers/gpu/drm/vc4/vc4_validate_shaders.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_validate_shaders.c b/drivers/gpu/drm/vc4/vc4_validate_shaders.c > index d48cf76983c0..af48758592f9 100644 > --- a/drivers/gpu/drm/vc4/vc4_validate_shaders.c > +++ b/drivers/gpu/drm/vc4/vc4_validate_shaders.c > @@ -291,14 +291,14 @@ static bool require_uniform_address_uniform(struct vc4_validated_shader_info *va > uint32_t o = validated_shader->num_uniform_addr_offsets; > uint32_t num_uniforms = validated_shader->uniforms_size / 4; Declare the variable here. > > - validated_shader->uniform_addr_offsets = > - krealloc(validated_shader->uniform_addr_offsets, > - (o + 1) * > - sizeof(*validated_shader->uniform_addr_offsets), > - GFP_KERNEL); > - if (!validated_shader->uniform_addr_offsets) > + void *mem = krealloc(validated_shader->uniform_addr_offsets, Instead of void *, you should probably use uint32_t *. Best regards, - Maíra > + (o + 1) * > + sizeof(*validated_shader->uniform_addr_offsets), > + GFP_KERNEL); > + if (!mem) > return false; > > + validated_shader->uniform_addr_offsets = mem; > validated_shader->uniform_addr_offsets[o] = num_uniforms; > validated_shader->num_uniform_addr_offsets++; >