From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.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 ED676426EA2 for ; Wed, 27 May 2026 15:02:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779894164; cv=none; b=k7Sk733dOFJwewQ5j8ndZBYrlnbjoAVgbb9WBwbeC1MIHtOXZk29bZgUJwZ/lhA3/rE3WjIIZKArz0kiZSlh/UZ3O6a1LLhcCHN6NHERrV2uPn2xmtEJBloEmtd5Hpz+RFkPne+NPy2mPwwgZRgbk9WspDT0DauPTlub2ZpssvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779894164; c=relaxed/simple; bh=SVvDiffb/nQ6NalN7qs94CnE2E+NZ1sLlPWERmt385M=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=htkPq/3plrFW6FbjW6tx9eux4VQakO7UmExKsLDPsqzVQP1+/qZqLWAkP1BGDB+my30TYpAxKY/BZlIgmCRExmEcY0LtKgDr9KEa/4/nEnipzqxwaMQtP75Z4lE+hfhi3Vx9QSnoqB4bp4sNOUjA24Ld5TenVaV+8b0YUTQVJ2Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=k8LdY8d/; arc=none smtp.client-ip=209.85.128.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--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="k8LdY8d/" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-49048bcbeb8so61907425e9.2 for ; Wed, 27 May 2026 08:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779894161; x=1780498961; 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=q7J1ztb6Z4HCTvPSQ3KlFjIJDDk9HF6V81J85Mqd8VE=; b=k8LdY8d/9aw3tB9DcQc+QDMLLi5t15lscxdRN6MlUnBdSFUtW+Io58ridAgjYBY/R2 RrUpuvB5jCZOjjfg6JoetGq3hn62h3DJZl3hYYXzRWSL/+uns02xvHx1X9IF8792BHCZ W9+z26yPiPe50UzLA5ae4U6rX2mYxeJTscld5jxWe68cYJ9OTEZjYpvbjP3e5NFY1wQd s/23/biZO6njtNS6gHBebl0GmLXs3QHvINPEe3dxPrvhe134stDUjA228o9IjRaPLKGf XGtz9n+YYp2ktuC/7GbZHiDN1uPuu+QMkbCIi7/+VwJO7hRUuZAS5jVIepMNr56xVxCH E0aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779894161; x=1780498961; 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=q7J1ztb6Z4HCTvPSQ3KlFjIJDDk9HF6V81J85Mqd8VE=; b=m+SB2NW8iGE5N5mgvwau0n7YNf/Sn1XC8+3P3HWO+ZRuzvd5aEftE1V6mJhbpG/kkv x5ueKQetHMryqA3J53g7C8BQl3EGCHys5Loq9zQD7K4MLta2qyVX/8XsWom8DW/XCLuf EnSFk51mdruj6y4LF7PdvRG43EOS7VrzlK8vaRBHbe0GMy/59b1GHCEpolDwpM6NIVxn tM5+TSVMYtIpicSzfLvM/BZsu0vwHq+ARRVDH49E4cpmqCcjDOXHuoKNETXzUcX9ixj8 kDrTbX2if0bEaKBOsbacdwwlH6MbqTvnBNWxkRIyj4DpsGtQBzcm8Bkn3l6+750Dw2ze ObAg== X-Forwarded-Encrypted: i=1; AFNElJ9gdyP/bz+V51CdXc4E3zpDMXWyMrsV07uBxzECw5TFCZQy2936Y7imbZf4v5L9bQZ1e0NUHkUe9Q4efbM=@vger.kernel.org X-Gm-Message-State: AOJu0YzvV7Ofx2eD20WXhSb2AhYvvu9QLm+j1AZ6dUcX15FYkIzI3Bxo kBe9pPhsBGaW9OHCPAW3PJcjc8go65V3nRrLincD4x642dHE0BG1KfrXzL2aLQO/0X+jHHC5vz/ XMqWO5uzgv9tQtA== X-Received: from wrrj16.prod.google.com ([2002:adf:ff90:0:b0:43d:2d2:c03b]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:530c:b0:490:5527:3be2 with SMTP id 5b1f17b1804b1-49055273be6mr302305885e9.32.1779894161027; Wed, 27 May 2026 08:02:41 -0700 (PDT) Date: Wed, 27 May 2026 15:02:31 +0000 In-Reply-To: <20260527150236.1978655-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260527150236.1978655-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260527150236.1978655-2-smostafa@google.com> Subject: [PATCH v6 1/6] optee: ffa: Add NULL check in optee_ffa_lend_protmem From: Mostafa Saleh To: op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: maz@kernel.org, oupton@kernel.org, joey.gouly@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, jens.wiklander@linaro.org, sumit.garg@kernel.org, sebastianene@google.com, vdonnefort@google.com, sudeep.holla@kernel.org, Mostafa Saleh Content-Type: text/plain; charset="UTF-8" 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 --- 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.746.g67dd491aae-goog