dcerpc srvsvc: minor tweak

Not sure what way to handle when you have things like int xxx switch_is(xxx) foo_union and automatically pass the outer xxx to the array arm in foo_union. For now have to specify both in the structures before encoding it, but it would be nice to have it done automatically and for decoding it would be nice to automatically verify that both instances of xxx read from the iov are actually the same value. This is so much easier to handle when you have an idl compiler that can automatically inject the code you need. But I will have to do with what I have for now. Signed-off-by: Ronnie Sahlberg <[email protected]>
sahlberg · Sep 30, 2024 · ba342cb · ba342cb
1 parent 1b63d94
commit ba342cb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/include/smb2/libsmb2-dcerpc-srvsvc.h b/include/smb2/libsmb2-dcerpc-srvsvc.h
@@ -55,7 +55,7 @@ int srvsvc_SHARE_INFO_0_coder(struct dcerpc_context *ctx,
                               void *ptr);
 
 struct srvsvc_SHARE_INFO_0_carray {
-        uint32_t max_count; /* filled in by caller before decode */
+        uint32_t max_count;
         struct srvsvc_SHARE_INFO_0 *share_info_0;
 };
 
@@ -75,7 +75,7 @@ int srvsvc_SHARE_INFO_1_coder(struct dcerpc_context *ctx,
                               void *ptr);
 
 struct srvsvc_SHARE_INFO_1_carray {
-        uint32_t max_count; /* filled in by caller before decode */
+        uint32_t max_count;
         struct srvsvc_SHARE_INFO_1 *share_info_1;
 };
 
@@ -90,7 +90,7 @@ int srvsvc_SHARE_INFO_1_CONTAINER_coder(struct dcerpc_context *dce,
                                         void *ptr);
 
 struct srvsvc_SHARE_ENUM_UNION {
-        uint32_t level;
+        uint32_t Level;
         union {
                 struct srvsvc_SHARE_INFO_0_CONTAINER Level0;
                 struct srvsvc_SHARE_INFO_1_CONTAINER Level1;

diff --git a/lib/dcerpc-srvsvc.c b/lib/dcerpc-srvsvc.c
@@ -80,6 +80,11 @@ p_syntax_id_t srvsvc_interface = {
  * [MS-SRVS].pdf
  */
 
+/*
+ * typedef struct _SHARE_INFO_0 {
+ *     [string] wchar_t * shi0_netname;
+ * } SHARE_INFO_0, *PSHARE_INFO_0, *LPSHARE_INFO_0;
+ */
 int
 srvsvc_SHARE_INFO_0_coder(struct dcerpc_context *ctx,
                            struct dcerpc_pdu *pdu,
@@ -238,13 +243,13 @@ srvsvc_SHARE_ENUM_UNION_coder(struct dcerpc_context *ctx, struct dcerpc_pdu *pdu
         struct srvsvc_SHARE_ENUM_UNION *ctr = ptr;
         uint64_t p;
 
-        p = ctr->level;
+        p = ctr->Level;
         if (dcerpc_uint3264_coder(ctx, pdu, iov, offset, &p)) {
                 return -1;
         }
-        ctr->level = (uint32_t)p;
+        ctr->Level = (uint32_t)p;
 
-        switch (ctr->level) {
+        switch (ctr->Level) {
         case 0:
                 if (dcerpc_ptr_coder(ctx, pdu, iov, offset, &ctr->Level0,
                                      PTR_UNIQUE,
@@ -280,7 +285,6 @@ srvsvc_SHARE_ENUM_STRUCT_coder(struct dcerpc_context *ctx, struct dcerpc_pdu *pd
         if (dcerpc_uint32_coder(ctx, pdu, iov, offset, &ses->Level)) {
                 return -1;
         }
-        ses->ShareInfo.level = ses->Level;
         if (srvsvc_SHARE_ENUM_UNION_coder(ctx, pdu, iov, offset, &ses->ShareInfo)) {
                 return -1;
         }

diff --git a/lib/dcerpc.c b/lib/dcerpc.c
@@ -945,7 +945,6 @@ dcerpc_encode_utf16(struct dcerpc_context *ctx, struct dcerpc_pdu *pdu,
 
         /* Conformance part */
         if (pdu->is_conformance_run) {
-                // QQQ check for s->utf8==NULL
                 if (s->utf8 == NULL) {
                         s->utf8 = "";
                 }

diff --git a/lib/smb2-share-enum.c b/lib/smb2-share-enum.c
@@ -168,11 +168,13 @@ smb2_share_enum_async(struct smb2_context *smb2,
         switch (level) {
         case SHARE_INFO_0:
                 nse->se_req.ses.Level = level;
+                nse->se_req.ses.ShareInfo.Level = level;
                 nse->se_req.ses.ShareInfo.Level0.EntriesRead = 0;
                 nse->se_req.ses.ShareInfo.Level0.Buffer = NULL;
                 break;
         case SHARE_INFO_1:
                 nse->se_req.ses.Level = level;
+                nse->se_req.ses.ShareInfo.Level = level;
                 nse->se_req.ses.ShareInfo.Level1.EntriesRead = 0;
                 nse->se_req.ses.ShareInfo.Level1.Buffer = NULL;
                 break;