cifs: check kzalloc return (0544b324) · Commits · 戴 / test

kzalloc can return NULL so an additional check is needed. While there is a check for ret_buf there is no check for the allocation of ret_buf->crfid.fid - this check is thus added. Both call-sites of tconInfoAlloc() check for NULL return of tconInfoAlloc() so returning NULL on failure of kzalloc() here seems appropriate. As the kzalloc() is the only thing here that can fail it is moved to the beginning so as not to initialize other resources on failure of kzalloc. Fixes: ("smb3: fix redundant opens on root") Signed-off-by:

Joe Perches <joe@perches.com> Signed-off-by:

Steve French <stfrench@microsoft.com>

fs/cifs/misc.c

+20 −14

Original line number	Diff line number	Diff line
		@@ -111,8 +111,16 @@ struct cifs_tcon *
		tconInfoAlloc(void)
		{
		struct cifs_tcon *ret_buf;
		ret_buf = kzalloc(sizeof(struct cifs_tcon), GFP_KERNEL);
		if (ret_buf) {

		ret_buf = kzalloc(sizeof(*ret_buf), GFP_KERNEL);
		if (!ret_buf)
		return NULL;
		ret_buf->crfid.fid = kzalloc(sizeof(*ret_buf->crfid.fid), GFP_KERNEL);
		if (!ret_buf->crfid.fid) {
		kfree(ret_buf);
		return NULL;
		}

		atomic_inc(&tconInfoAllocCount);
		ret_buf->tidStatus = CifsNew;
		++ret_buf->tc_count;
		@@ -120,12 +128,10 @@ tconInfoAlloc(void)
		INIT_LIST_HEAD(&ret_buf->tcon_list);
		spin_lock_init(&ret_buf->open_file_lock);
		mutex_init(&ret_buf->crfid.fid_mutex);
		ret_buf->crfid.fid = kzalloc(sizeof(struct cifs_fid),
		GFP_KERNEL);
		spin_lock_init(&ret_buf->stat_lock);
		atomic_set(&ret_buf->num_local_opens, 0);
		atomic_set(&ret_buf->num_remote_opens, 0);
		}

		return ret_buf;
		}

Admin message