Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
From:   Li Zhong <floridsleeves@gmail.com>
Date:   Fri, 2 Sep 2022 23:25:31 -0700
Message-ID: <CAMEuxRrg0nSroVGXwaCM1579Ddb822mY0hkSX5_Kcz1YqF_9sg@mail.gmail.com>
Subject: [PATCH v1] drivers/base/auxiliary: check return value of strrchr()
To:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc:     Greg KH <gregkh@linuxfoundation.org>, rafael@kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

From: Li Zhong <floridsleeves@gmail.com>

The return value of strrchr() could be NULL, which will cause invalid
offset in (int)(p - name). So we check it here.

Signed-off-by: Li Zhong <floridsleeves@gmail.com>
---
 drivers/base/auxiliary.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
index 8c5e65930617..7ac23be47e1f 100644
--- a/drivers/base/auxiliary.c
+++ b/drivers/base/auxiliary.c
@@ -191,7 +191,8 @@ static int auxiliary_uevent(struct device *dev,
struct kobj_uevent_env *env)

  name = dev_name(dev);
  p = strrchr(name, '.');
-
+ if (!p)
+ return -EINVAL;
  return add_uevent_var(env, "MODALIAS=%s%.*s", AUXILIARY_MODULE_PREFIX,
        (int)(p - name), name);
 }
-- 
2.25.1