]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ceph: validate snapdirname option length when mounting
authorIlya Dryomov <idryomov@gmail.com>
Wed, 20 Nov 2024 15:43:51 +0000 (16:43 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jan 2025 12:24:55 +0000 (13:24 +0100)
commit 12eb22a5a609421b380c3c6ca887474fb2089b2c upstream.

It becomes a path component, so it shouldn't exceed NAME_MAX
characters.  This was hardened in commit c152737be22b ("ceph: Use
strscpy() instead of strcpy() in __get_snap_name()"), but no actual
check was put in place.

Cc: stable@vger.kernel.org
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Markuze <amarkuze@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ceph/super.c

index 4e09d8e0664738c23e678a2590b0322c4764a293..3ef197742430218748b10b5a0dd5c357449796e0 100644 (file)
@@ -301,6 +301,8 @@ static int ceph_parse_mount_param(struct fs_context *fc,
 
        switch (token) {
        case Opt_snapdirname:
+               if (strlen(param->string) > NAME_MAX)
+                       return invalfc(fc, "snapdirname too long");
                kfree(fsopt->snapdir_name);
                fsopt->snapdir_name = param->string;
                param->string = NULL;