Unverified Commit f070b14c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7138 SUNRPC: fix some memleaks in gssx_dec_option_array 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/W45RJJOMTWO2OAXXWMPXNCBSFBP6PMS6/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L9J1 
 
Link:https://gitee.com/openeuler/kernel/pulls/7138

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents f35cd256 3cb5b917

net/sunrpc/auth_gss/gss_rpc_xdr.c

+19 −8
Original line number Diff line number Diff line
@@ -263,8 +263,8 @@ static int gssx_dec_option_array(struct xdr_stream *xdr, 


	creds = kzalloc(sizeof(struct svc_cred), GFP_KERNEL);

	if (!creds) {

		kfree(oa->data);

		return -ENOMEM;

		err = -ENOMEM;

		goto free_oa;

	}



	oa->data[0].option.data = CREDS_VALUE;
@@ -278,29 +278,40 @@ static int gssx_dec_option_array(struct xdr_stream *xdr, 


		/* option buffer */

		p = xdr_inline_decode(xdr, 4);

		if (unlikely(p == NULL))

			return -ENOSPC;

		if (unlikely(p == NULL)) {

			err = -ENOSPC;

			goto free_creds;

		}



		length = be32_to_cpup(p);

		p = xdr_inline_decode(xdr, length);

		if (unlikely(p == NULL))

			return -ENOSPC;

		if (unlikely(p == NULL)) {

			err = -ENOSPC;

			goto free_creds;

		}



		if (length == sizeof(CREDS_VALUE) &&

		    memcmp(p, CREDS_VALUE, sizeof(CREDS_VALUE)) == 0) {

			/* We have creds here. parse them */

			err = gssx_dec_linux_creds(xdr, creds);

			if (err)

				return err;

				goto free_creds;

			oa->data[0].value.len = 1; /* presence */

		} else {

			/* consume uninteresting buffer */

			err = gssx_dec_buffer(xdr, &dummy);

			if (err)

				return err;

				goto free_creds;

		}

	}

	return 0;



free_creds:

	kfree(creds);

free_oa:

	kfree(oa->data);

	oa->data = NULL;

	return err;

}



static int gssx_dec_status(struct xdr_stream *xdr,