Browse Source

ceph: strengthen rsize/wsize/readdir_max_bytes validation

The check (intval < PAGE_SIZE) will involve type cast, so even when
specifying negative value to rsize/wsize/readdir_max_bytes, it will
pass the validation check successfully.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Chengguang Xu 7 years ago
parent
commit
8db0c7596f
1 changed files with 3 additions and 3 deletions
  1. 3 3
      fs/ceph/super.c

+ 3 - 3
fs/ceph/super.c

@@ -259,12 +259,12 @@ static int parse_fsopt_token(char *c, void *private)
 		break;
 		break;
 		/* misc */
 		/* misc */
 	case Opt_wsize:
 	case Opt_wsize:
-		if (intval < PAGE_SIZE || intval > CEPH_MAX_WRITE_SIZE)
+		if (intval < (int)PAGE_SIZE || intval > CEPH_MAX_WRITE_SIZE)
 			return -EINVAL;
 			return -EINVAL;
 		fsopt->wsize = ALIGN(intval, PAGE_SIZE);
 		fsopt->wsize = ALIGN(intval, PAGE_SIZE);
 		break;
 		break;
 	case Opt_rsize:
 	case Opt_rsize:
-		if (intval < PAGE_SIZE || intval > CEPH_MAX_READ_SIZE)
+		if (intval < (int)PAGE_SIZE || intval > CEPH_MAX_READ_SIZE)
 			return -EINVAL;
 			return -EINVAL;
 		fsopt->rsize = ALIGN(intval, PAGE_SIZE);
 		fsopt->rsize = ALIGN(intval, PAGE_SIZE);
 		break;
 		break;
@@ -289,7 +289,7 @@ static int parse_fsopt_token(char *c, void *private)
 		fsopt->max_readdir = intval;
 		fsopt->max_readdir = intval;
 		break;
 		break;
 	case Opt_readdir_max_bytes:
 	case Opt_readdir_max_bytes:
-		if (intval < PAGE_SIZE && intval != 0)
+		if (intval < (int)PAGE_SIZE && intval != 0)
 			return -EINVAL;
 			return -EINVAL;
 		fsopt->max_readdir_bytes = intval;
 		fsopt->max_readdir_bytes = intval;
 		break;
 		break;