From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (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 B59B923C516 for ; Thu, 16 Apr 2026 04:23:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776313425; cv=none; b=Xa7w09aXCrwJ57fS3/4SvAhz65YoyypsfsDoSpDSyaCOK494AYhFw2mh3B96EuBt4VTlXU3lzyasdoZVpKSgM9gDKy8nZSLINlTxYHYK8FBwGjEW4PQlQJoIy2O4YJT/G2X1LVe1WGViQrZBt0FjMS4dhcrKoAx+vBJ3cydeQOs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776313425; c=relaxed/simple; bh=KklDyCzAUojn295n1umdDqC4Zpnz79oLMe6byV+t8WE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=a2q65tFYcAqSYQq4bAtNUKVK6rOUSDNeii1t7COfK3d/i5bZ75RqnXUPMfuQFBgAxIGCXW0osxKKuYEFMVd2JEFYkyQ2Nlw0ksePhG+JdRrBaRet2jlX7573P2vux8HeuI7HVn7xkc7BTSCHW+Mz2INT/ZLWNgeEdS6mrEKc9v8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JWRd+HbR; arc=none smtp.client-ip=209.85.160.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JWRd+HbR" Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-50d75bfb259so49901501cf.1 for ; Wed, 15 Apr 2026 21:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776313422; x=1776918222; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LMrjxuZ4kKLfqzieZnU36oY2oOClSqjVbtmlgd6Ky5I=; b=JWRd+HbR8h6KwC5zbDONKRDiVdkjGKsDFLgPPHh7AizkRXn4L66tdvwYuOrJNn+OeB PwTNxtOhciY8OS0mJXqRjRTzk0AGtqpZXms3ZkrO8w61GHN2e0hLzYClY0wIbnQrjok+ m+AyiBCxJr5yE87jMtOj8xWBBkochVFAfXs/3MKAwhWEd4A309ccdgDY9tuWEUCOtmtf vtICp0jdfR5cNFDLt1yBHm7RUoKH2VOyzUilQKxso1PK4L+fGKD2yFHDEC+WqjPoRJZJ Ue0Xik2xrIVirCfKif8KElZD6wv93hIMPwXwMi1VV3bryvOjSoWJ9jkDneWQGzg6PZC2 mh7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776313422; x=1776918222; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LMrjxuZ4kKLfqzieZnU36oY2oOClSqjVbtmlgd6Ky5I=; b=lM3sNi3tKjsWnhR5676iGyTxYaOQMcbrt1e7kYFK+740ww9nOTIerM9yc8o4z9NWyS 2psb6esA99It5jzYY8+ckgiplm5fD+1kvAiusXqokiQflD/lbXEZoXzW6PfUNm+MtxcX azvzfjfU6ovbqgoJ0S6H/FSFiREIWXHzEMJAmufTcp1fFVylAG36spySOJif/xWd6Ff6 pBcHcVc7HmqZjpDBLPcjY6CP066BU71tdlwQUJLhsd9ZaUtvPwsrYbYq1a7fzciSbBjp vZ1qjwhyZlbaw5ZJH0LXi7aFm0lpzn6HU6XjAMiMOa2qr1TidklwYiexN6oeGVofcdRm sHYw== X-Forwarded-Encrypted: i=1; AFNElJ+CImjpgBJrkS//8hocpemOMoaJw/g0HiS8SS4mic0n/+XVxGzzXrJ/wKX6wVJlhgJ4l8NhU1tGxxTFeAU=@vger.kernel.org X-Gm-Message-State: AOJu0Yxpe+/VKA/wt9Eliw8BrhrV6+xcVkDRh4225oqVBJJvJdTYoYGf absvjXP/uw7iFIgTT4eVHIb9+/BeAa/R43Q5raT+owPHCuUHRIXV7Qwe X-Gm-Gg: AeBDiesr1t0ZeeTuGVizMcdTHxFzrVkorQyCFsrOya51O1qXew9Ek758UBzD38rPYkb QoKhXho3uIH+RHtqjQJSnr8yszBdg30ckNuQY4FMzaODJNowbrPVaUe025zgRCg4lM+Jehxincc VQKnHuoJJg2uduzLRFYvxW98Aq7zhXzerEU1lCOeFgaqYNWo0RQELh6iYepwtIsq1YL0L3Gknzv JHd8SLE04sWCnMGxg/aWDUCChyWq2XpuBc9Gg0wlJA7lzxgIHwQHO0RoMWGymg9reyoJCYNhQzh /blV5dW55VvpSy9/R8KLe+Q8EBrlp+LEnvzYJDGWqIq4IkEA+SvM81GIn1iqd5xUedvSS7rqXGk I8CZp55wa/dFy9KTQyHK1YTCyROFVf4lUrJSvUSZzjmyaZ1PZ2Vw95dseBmrJ259dUb+IPZxYup O7B7KiTz8XiB/BDikOjB+4FrHr9XGuYGCBUpV0RDxy7KtrPk82dCbNoCaqYQ== X-Received: by 2002:a05:622a:145:b0:50d:83a4:2995 with SMTP id d75a77b69052e-50dd5ada0e5mr385385541cf.21.1776313422423; Wed, 15 Apr 2026 21:23:42 -0700 (PDT) Received: from localhost.localdomain ([165.85.38.17]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50e1af9c106sm33161751cf.14.2026.04.15.21.23.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Apr 2026 21:23:41 -0700 (PDT) From: Yuho Choi To: Bjorn Andersson , Mathieu Poirier Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, Yuho Choi Subject: [PATCH v1] rpmsg: char: fix use-after-free on probe error path Date: Thu, 16 Apr 2026 00:23:38 -0400 Message-ID: <20260416042338.10146-1-dbgh9129@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit rpmsg_chrdev_probe() stores the newly allocated eptdev in the default endpoint's priv pointer before calling rpmsg_chrdev_eptdev_add(). If rpmsg_chrdev_eptdev_add() then fails, its error path frees eptdev while the default endpoint may still dispatch inbound messages through rpmsg_ept_cb(), leaving the callback with a dangling priv pointer. Avoid publishing eptdev through the default endpoint until rpmsg_chrdev_eptdev_add() succeeds. Any message that arrives before the priv is published should be ignored, so make rpmsg_ept_cb() return success when priv is NULL. Fixes: bc69d10665690 ("rpmsg: char: Introduce the "rpmsg-raw" channel") Signed-off-by: Yuho Choi --- drivers/rpmsg/rpmsg_char.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index ca9cf8858a5ef..549a24b70884d 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c @@ -11,6 +11,7 @@ * was based on TI & Google OMX rpmsg driver. */ +#include "asm-generic/rwonce.h" #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include @@ -104,6 +105,9 @@ static int rpmsg_ept_cb(struct rpmsg_device *rpdev, void *buf, int len, struct rpmsg_eptdev *eptdev = priv; struct sk_buff *skb; + if (!eptdev) + return 0; + skb = alloc_skb(len, GFP_ATOMIC); if (!skb) return -ENOMEM; @@ -490,6 +494,7 @@ static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev) struct rpmsg_channel_info chinfo; struct rpmsg_eptdev *eptdev; struct device *dev = &rpdev->dev; + int ret; memcpy(chinfo.name, rpdev->id.name, RPMSG_NAME_SIZE); chinfo.src = rpdev->src; @@ -502,13 +507,17 @@ static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev) /* Set the default_ept to the rpmsg device endpoint */ eptdev->default_ept = rpdev->ept; + ret = rpmsg_chrdev_eptdev_add(eptdev, chinfo); + + if (ret) + return ret; /* * The rpmsg_ept_cb uses *priv parameter to get its rpmsg_eptdev context. - * Storedit in default_ept *priv field. + * Stored it in default_ept *priv field. */ eptdev->default_ept->priv = eptdev; - return rpmsg_chrdev_eptdev_add(eptdev, chinfo); + return 0; } static void rpmsg_chrdev_remove(struct rpmsg_device *rpdev) -- 2.50.1 (Apple Git-155)