From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (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 1AF0226ED3C for ; Wed, 17 Jun 2026 14:51:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781707902; cv=none; b=pHR+1QD3JcXF070JWOJ3gvPvsEXEpVmkGMSZKSTU0vEtU1qugoPHU9A18maGNxFxHHqxg1U11zqIPHKf77PRZ2BQjlWhAJjRDtJVPtRsw0seUea/Ox4U7w4bflDUO9wYBNitoIoiddgI0Zm1lzLzTfdwNmjkRIyLuxg1MuNccow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781707902; c=relaxed/simple; bh=fmNOj5noDV8FLWJ+KWreCVyhF0Hc+7vAbj6fINFnd0Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=c5Q6GvyL2Yr411sSvwts5Us6ni+q5fjMAgBlua/uodyyfwthRlGT5Bv/vO4EvB/wYfOmdrkNG/ZqL1yaCcqOy68EITPhxmcHIgY69X6bA1FEQAddr4gXt4sKQz4dwoJnBd5Z4TJQy0bSSKBKiyEXFYiIsQnOr6yfXr3g2A4r9Fk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PWIB0xBH; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PWIB0xBH" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-45efa2f7009so4067041f8f.3 for ; Wed, 17 Jun 2026 07:51:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781707899; x=1782312699; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=iDAOdwtxrmt1yvz0cAbxnb4xCO26mPsS8gCJRaVl/Ak=; b=PWIB0xBHalmuIwhZRE2aWB0MlzyjxJdB/neK2m0f1fhQk4wrFaUE3nnFWOeS/LVw2k YTGYCSnZ2FdCFB+fdOVagSFeVDNoxjbheY8Blw/jIgQn3Pq2vGp7bNGw6J0mXIwourND U2R9P/Czw8lzIHkeFP4iCf0h2LZ+AHg6H4Y1ldUK7zrQRRXG6EwGL+QIGw5d/DLC5gfR j1Y6r+IUg0u8UqZ9Erv5YYJso0PjfNdY+5V1XEhsNu7QLbqrXnQ1JmyGWGCo7kPEA08p Uz5zpcGrr5DDe9HWGBsR/0NFat8PtZeaSS42MpaYQ7dHQutv7KgWHfp/TzNY8Z9hYdad 8sRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781707899; x=1782312699; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iDAOdwtxrmt1yvz0cAbxnb4xCO26mPsS8gCJRaVl/Ak=; b=fgQZmxyXi2TdDKchlCOvE2uD4MiMoSkruU+v2qzr514LKuBG6m6yRByMVeyYIIR2YL KMOAjhkAnN2Edxj9dUETWrWRfS0mFEAMSxe2641M3xpuEjmjmsxoPg9bvKbC4deQe18w x20F+XmpfsH/aqP/jJk1og7O9xXMIPC3odWOcVEnobC2V9X8uBIzAdjER3VezTirr1a1 mz0TtYBBUhD0ye6f5c7JDoVpihLxFAmxN7SZbPtHzZ21o+y2BN84GhVg4sjbMO0HIg28 DF99ATf/LflMN7e7mPqm6BPSwqM4F2DMRdcrTmjytNzBvhy2ew1DwgX41J92PmApLncg Igig== X-Forwarded-Encrypted: i=1; AFNElJ+NeLrHqvNXcFlqYDSkQgdPM0w8n86u6C8pOllaKV++NJLv5TPW90ZGF3TPcpubNsjvWa4l9JNmzKfEd7s=@vger.kernel.org X-Gm-Message-State: AOJu0YycF28Sdx5TbizVSWOa5SdTkl1jEEPulU8cv6Xg3nZxU3DPqvwW BJU/YtPmS3jKwhtBAxxQppPf+eOAXz7GEnf4P9PBmZBkgEhE+QrL9KKLfQhAzM8KWiyl5bnLgrD EYaFO/1VoROKN8VENg5QHTbPqhVoTWQ== X-Received: from wraz22.prod.google.com ([2002:a05:6000:4696:b0:45e:e4d6:bba4]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:adf:f206:0:b0:441:1e1e:a050 with SMTP id ffacd0b85a97d-462374b8285mr5538800f8f.16.1781707898956; Wed, 17 Jun 2026 07:51:38 -0700 (PDT) Date: Wed, 17 Jun 2026 14:51:24 +0000 In-Reply-To: <20260617145130.3729015-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260617145130.3729015-1-sebastianene@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260617145130.3729015-2-sebastianene@google.com> Subject: [PATCH v7 1/7] optee: ffa: Add NULL check in optee_ffa_lend_protmem From: Sebastian Ene To: catalin.marinas@arm.com, oupton@kernel.org, sudeep.holla@kernel.org, will@kernel.org Cc: jens.wiklander@linaro.org, joey.gouly@arm.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, android-kvm@google.com, maz@kernel.org, mrigendra.chaubey@gmail.com, op-tee@lists.trustedfirmware.org, perlarsen@google.com, sebastianene@google.com, seiden@linux.ibm.com, smostafa@google.com, sumit.garg@kernel.org, suzuki.poulose@arm.com, vdonnefort@google.com, yuzenghui@huawei.com, Sumit Garg Content-Type: text/plain; charset="UTF-8" From: Mostafa Saleh From: Mostafa Saleh Sashiko (locally) reports a possible null dereference under memory pressure due to the lack of validation of the allocated pointer. Fix that by adding the missing check. Fixes: 2b78d79cdf96 ("optee: FF-A: dynamic protected memory allocation") Signed-off-by: Mostafa Saleh Signed-off-by: Sebastian Ene Reviewed-by: Sumit Garg --- drivers/tee/optee/ffa_abi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index b4372fa268d0..633715b98625 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -698,6 +698,9 @@ static int optee_ffa_lend_protmem(struct optee *optee, struct tee_shm *protmem, int rc; mem_attr = kzalloc_objs(*mem_attr, ma_count); + if (!mem_attr) + return -ENOMEM; + for (n = 0; n < ma_count; n++) { mem_attr[n].receiver = mem_attrs[n] & U16_MAX; mem_attr[n].attrs = mem_attrs[n] >> 16; -- 2.54.0.1136.gdb2ca164c4-goog