cifs.idmap: fix endianness on SIDs before sending to kernel

Winbind keeps wbcDomainSids in host-endian format. They must be
converted to little-endian before we can ship them off to the
kernel.

Signed-off-by: Jeff Layton <jlayton@samba.org>

diff --git a/cifs.idmap.c b/cifs.idmap.c
index d2ccbb1e117ea2fbf7174bd7b3dcedb26b42e864..4109ca00aa7048120f594c5e200eaa7f474c97e7 100644 (file)
--- a/cifs.idmap.c
+++ b/cifs.idmap.c
@@ -42,6 +42,8 @@
 #include <limits.h>
 #include <wbclient.h>
 
 #include <limits.h>
 #include <wbclient.h>
 

+#include "cifsacl.h"
+

 static const char *prog = "cifs.idmap";
 
 static const struct option long_options[] = {
 static const char *prog = "cifs.idmap";
 
 static const struct option long_options[] = {


@@ -99,6 +101,19 @@ str_to_uint(const char *src, unsigned int *dst)
        return 0;
 }
 
        return 0;
 }
 

+/*
+ * Winbind keeps wbcDomainSid fields in host-endian. So, we must convert it
+ * to little endian since the kernel will expect that.
+ */
+static void
+convert_sid_endianness(struct cifs_sid *sid)
+{
+       int i;
+
+       for (i = 0; i < sid->num_subauth; i++)
+               sid->sub_auth[i] = htole32(sid->sub_auth[i]);
+}
+

 static int
 cifs_idmap(const key_serial_t key, const char *key_descr)
 {
 static int
 cifs_idmap(const key_serial_t key, const char *key_descr)
 {


@@ -173,7 +188,9 @@ cifs_idmap(const key_serial_t key, const char *key_descr)
                rc = wbcUidToSid(uid, &sid);
                if (rc)
                        syslog(LOG_DEBUG, "uid %u to SID  error: %d", uid, rc);
                rc = wbcUidToSid(uid, &sid);
                if (rc)
                        syslog(LOG_DEBUG, "uid %u to SID  error: %d", uid, rc);

-               if (!rc) { /* SID has been mapped to a uid */
+               if (!rc) {
+                       /* SID has been mapped to a uid */
+                       convert_sid_endianness((struct cifs_sid *)&sid);

                        rc = keyctl_instantiate(key, &sid,
                                        sizeof(struct wbcDomainSid), 0);
                        if (rc)
                        rc = keyctl_instantiate(key, &sid,
                                        sizeof(struct wbcDomainSid), 0);
                        if (rc)


@@ -197,7 +214,9 @@ cifs_idmap(const key_serial_t key, const char *key_descr)
                rc = wbcGidToSid(gid, &sid);
                if (rc)
                        syslog(LOG_DEBUG, "gid %u to SID error: %d", gid, rc);
                rc = wbcGidToSid(gid, &sid);
                if (rc)
                        syslog(LOG_DEBUG, "gid %u to SID error: %d", gid, rc);

-               if (!rc) { /* SID has been mapped to a gid */
+               if (!rc) {
+                       /* SID has been mapped to a gid */
+                       convert_sid_endianness((struct cifs_sid *)&sid);

                        rc = keyctl_instantiate(key, &sid,
                                        sizeof(struct wbcDomainSid), 0);
                        if (rc)
                        rc = keyctl_instantiate(key, &sid,
                                        sizeof(struct wbcDomainSid), 0);
                        if (rc)