Looks good to me.
Reviewed-by: Hyunchul Lee <hyc.lee@xxxxxxxxx>
2022년 3월 1일 (화) 오후 8:35, Marios Makassikis <mmakassikis@xxxxxxxxxx>님이 작성:
>
> Rename ndr_*_uniq_vsting_ptr to ndr_*_uniq_vstring_ptr.
>
> No functional change.
>
> Signed-off-by: Marios Makassikis <mmakassikis@xxxxxxxxxx>
> ---
> include/rpc.h | 4 ++--
> mountd/rpc.c | 4 ++--
> mountd/rpc_lsarpc.c | 2 +-
> mountd/rpc_samr.c | 6 +++---
> mountd/rpc_srvsvc.c | 4 ++--
> mountd/rpc_wkssvc.c | 4 ++--
> 6 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/include/rpc.h b/include/rpc.h
> index 6d6b8bdc127c..63d79bc724c8 100644
> --- a/include/rpc.h
> +++ b/include/rpc.h
> @@ -319,10 +319,10 @@ int ndr_write_string(struct ksmbd_dcerpc *dce, char *str);
> int ndr_write_lsa_string(struct ksmbd_dcerpc *dce, char *str);
> char *ndr_read_vstring(struct ksmbd_dcerpc *dce);
> void ndr_read_vstring_ptr(struct ksmbd_dcerpc *dce, struct ndr_char_ptr *ctr);
> -void ndr_read_uniq_vsting_ptr(struct ksmbd_dcerpc *dce,
> +void ndr_read_uniq_vstring_ptr(struct ksmbd_dcerpc *dce,
> struct ndr_uniq_char_ptr *ctr);
> void ndr_free_vstring_ptr(struct ndr_char_ptr *ctr);
> -void ndr_free_uniq_vsting_ptr(struct ndr_uniq_char_ptr *ctr);
> +void ndr_free_uniq_vstring_ptr(struct ndr_uniq_char_ptr *ctr);
> void ndr_read_ptr(struct ksmbd_dcerpc *dce, struct ndr_ptr *ctr);
> void ndr_read_uniq_ptr(struct ksmbd_dcerpc *dce, struct ndr_uniq_ptr *ctr);
> int __ndr_write_array_of_structs(struct ksmbd_rpc_pipe *pipe, int max_entry_nr);
> diff --git a/mountd/rpc.c b/mountd/rpc.c
> index 2361634f1a55..4db422abe9b0 100644
> --- a/mountd/rpc.c
> +++ b/mountd/rpc.c
> @@ -540,7 +540,7 @@ void ndr_read_vstring_ptr(struct ksmbd_dcerpc *dce, struct ndr_char_ptr *ctr)
> ctr->ptr = ndr_read_vstring(dce);
> }
>
> -void ndr_read_uniq_vsting_ptr(struct ksmbd_dcerpc *dce,
> +void ndr_read_uniq_vstring_ptr(struct ksmbd_dcerpc *dce,
> struct ndr_uniq_char_ptr *ctr)
> {
> ctr->ref_id = ndr_read_int32(dce);
> @@ -557,7 +557,7 @@ void ndr_free_vstring_ptr(struct ndr_char_ptr *ctr)
> ctr->ptr = NULL;
> }
>
> -void ndr_free_uniq_vsting_ptr(struct ndr_uniq_char_ptr *ctr)
> +void ndr_free_uniq_vstring_ptr(struct ndr_uniq_char_ptr *ctr)
> {
> ctr->ref_id = 0;
> free(ctr->ptr);
> diff --git a/mountd/rpc_lsarpc.c b/mountd/rpc_lsarpc.c
> index 5caf4d9ef3ac..cc99a147b239 100644
> --- a/mountd/rpc_lsarpc.c
> +++ b/mountd/rpc_lsarpc.c
> @@ -350,7 +350,7 @@ static int lsarpc_lookup_names3_invoke(struct ksmbd_rpc_pipe *pipe)
> break;
> ndr_read_int16(dce); // length
> ndr_read_int16(dce); // size
> - ndr_read_uniq_vsting_ptr(dce, &username);
> + ndr_read_uniq_vstring_ptr(dce, &username);
> if (strstr(STR_VAL(username), "\\")) {
> strtok(STR_VAL(username), "\\");
> name = strtok(NULL, "\\");
> diff --git a/mountd/rpc_samr.c b/mountd/rpc_samr.c
> index 7fe942cf3f08..6425215f6d34 100644
> --- a/mountd/rpc_samr.c
> +++ b/mountd/rpc_samr.c
> @@ -84,7 +84,7 @@ static int samr_connect5_invoke(struct ksmbd_rpc_pipe *pipe)
> struct ksmbd_dcerpc *dce = pipe->dce;
> struct ndr_uniq_char_ptr server_name;
>
> - ndr_read_uniq_vsting_ptr(dce, &server_name);
> + ndr_read_uniq_vstring_ptr(dce, &server_name);
> ndr_read_int32(dce); // Access mask
> dce->sm_req.level = ndr_read_int32(dce); // level in
> ndr_read_int32(dce); // Info in
> @@ -184,7 +184,7 @@ static int samr_lookup_domain_invoke(struct ksmbd_rpc_pipe *pipe)
> ndr_read_bytes(dce, dce->sm_req.handle, HANDLE_SIZE);
> ndr_read_int16(dce); // name len
> ndr_read_int16(dce); // name size
> - ndr_read_uniq_vsting_ptr(dce, &dce->sm_req.name); // domain name
> + ndr_read_uniq_vstring_ptr(dce, &dce->sm_req.name); // domain name
>
> return KSMBD_RPC_OK;
> }
> @@ -254,7 +254,7 @@ static int samr_lookup_names_invoke(struct ksmbd_rpc_pipe *pipe)
> ndr_read_int16(dce); // name len
> ndr_read_int16(dce); // name size
>
> - ndr_read_uniq_vsting_ptr(dce, &dce->sm_req.name); // names
> + ndr_read_uniq_vstring_ptr(dce, &dce->sm_req.name); // names
>
> return KSMBD_RPC_OK;
> }
> diff --git a/mountd/rpc_srvsvc.c b/mountd/rpc_srvsvc.c
> index f3b4d069031a..7e9fa675d34a 100644
> --- a/mountd/rpc_srvsvc.c
> +++ b/mountd/rpc_srvsvc.c
> @@ -272,7 +272,7 @@ static int srvsvc_share_get_info_return(struct ksmbd_rpc_pipe *pipe)
> static int srvsvc_parse_share_info_req(struct ksmbd_dcerpc *dce,
> struct srvsvc_share_info_request *hdr)
> {
> - ndr_read_uniq_vsting_ptr(dce, &hdr->server_name);
> + ndr_read_uniq_vstring_ptr(dce, &hdr->server_name);
>
> if (dce->req_hdr.opnum == SRVSVC_OPNUM_SHARE_ENUM_ALL) {
> int ptr;
> @@ -330,7 +330,7 @@ static int srvsvc_clear_headers(struct ksmbd_rpc_pipe *pipe,
> if (status == KSMBD_RPC_EMORE_DATA)
> return 0;
>
> - ndr_free_uniq_vsting_ptr(&pipe->dce->si_req.server_name);
> + ndr_free_uniq_vstring_ptr(&pipe->dce->si_req.server_name);
> if (pipe->dce->req_hdr.opnum == SRVSVC_OPNUM_GET_SHARE_INFO)
> ndr_free_vstring_ptr(&pipe->dce->si_req.share_name);
>
> diff --git a/mountd/rpc_wkssvc.c b/mountd/rpc_wkssvc.c
> index 32b7893eb2c6..ba7f9a841e3d 100644
> --- a/mountd/rpc_wkssvc.c
> +++ b/mountd/rpc_wkssvc.c
> @@ -31,7 +31,7 @@
> static int wkssvc_clear_headers(struct ksmbd_rpc_pipe *pipe,
> int status)
> {
> - ndr_free_uniq_vsting_ptr(&pipe->dce->wi_req.server_name);
> + ndr_free_uniq_vstring_ptr(&pipe->dce->wi_req.server_name);
> return 0;
> }
>
> @@ -141,7 +141,7 @@ static int
> wkssvc_parse_netwksta_info_req(struct ksmbd_dcerpc *dce,
> struct wkssvc_netwksta_info_request *hdr)
> {
> - ndr_read_uniq_vsting_ptr(dce, &hdr->server_name);
> + ndr_read_uniq_vstring_ptr(dce, &hdr->server_name);
> hdr->level = ndr_read_int32(dce);
> return 0;
> }
> --
> 2.25.1
>
--
Thanks,
Hyunchul
