[rsbac] BUG with DEV Attributes in 1.2.1-pre5:syscalls.c

[Amon Ott]

--------------Boundary-00=_LAY4V8U4GFSSXIVUHJ4B
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 8bit

Hi!
 
In pre5, rsbac_get_attr and rsbac_set_attr syscalls handle the DEV object 
addresses incorrectly, so that DEV attributes get lost.

ACL syscalls and other target types work fine.

Please use the attached patch against rsbac/help/syscalls.c or the rsync 
version, which has just been corrected.

Amon.
--
http://www.rsbac.org

--------------Boundary-00=_LAY4V8U4GFSSXIVUHJ4B
Content-Type: text/x-diff;
  charset="iso-8859-15";
  name="syscalls.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="syscalls.diff"

LS0tIHN5c2NhbGxzLmN+CUZyaSBBdWcgIDkgMTE6NTg6MzcgMjAwMgorKysgc3lzY2FsbHMuYwlU
dWUgQXVnIDIwIDEwOjAyOjQzIDIwMDIKQEAgLTQzOSwxMCArNDM5LDIxIEBACiAgICAgICAgICAg
ICBnb3RvIG91dF9kcHV0OwogICAgICAgICB9CiAKLSAgICAgIC8qIGZpbGwgdGFyZ2V0IGlkIGFu
ZCBjYWxsIGludGVybmFsIGZ1bmN0aW9uICovCi0gICAgICB0aWQuZmlsZS5kZXZpY2UgPSB0X2Rl
bnRyeS0+ZF9pbm9kZS0+aV9kZXY7Ci0gICAgICB0aWQuZmlsZS5pbm9kZSAgPSB0X2RlbnRyeS0+
ZF9pbm9kZS0+aV9pbm87Ci0gICAgICB0aWQuZmlsZS5kZW50cnlfcCA9IHRfZGVudHJ5OworICAg
ICAgaWYodGFyZ2V0ID09IFRfREVWKQorICAgICAgICB7CisgICAgICAgICAgaWYoU19JU0JMSyh0
X2RlbnRyeS0+ZF9pbm9kZS0+aV9tb2RlKSkKKyAgICAgICAgICAgIHRpZC5kZXYudHlwZSA9IERf
YmxvY2s7CisgICAgICAgICAgZWxzZQorICAgICAgICAgICAgdGlkLmRldi50eXBlID0gRF9jaGFy
OworICAgICAgICAgIHRpZC5kZXYuaWQgID0gdF9kZW50cnktPmRfaW5vZGUtPmlfcmRldjsKKyAg
ICAgICAgfQorICAgICAgZWxzZQorICAgICAgICB7CisgICAgICAgICAgLyogZmlsbCB0YXJnZXQg
aWQgYW5kIGNhbGwgaW50ZXJuYWwgZnVuY3Rpb24gKi8KKyAgICAgICAgICB0aWQuZmlsZS5kZXZp
Y2UgPSB0X2RlbnRyeS0+ZF9pbm9kZS0+aV9kZXY7CisgICAgICAgICAgdGlkLmZpbGUuaW5vZGUg
ID0gdF9kZW50cnktPmRfaW5vZGUtPmlfaW5vOworICAgICAgICAgIHRpZC5maWxlLmRlbnRyeV9w
ID0gdF9kZW50cnk7CisgICAgICAgIH0KICAgICAgIC8qIGNhbGwgQURGICovCiAjaWZkZWYgQ09O
RklHX1JTQkFDX0RFQlVHCiAgICAgICBpZiAocnNiYWNfZGVidWdfYWVmKSBwcmludGsoS0VSTl9E
RUJVRyAic3lzX3JzYmFjX2dldF9hdHRyX24oKTogY2FsbGluZyBBREZcbiIpOwpAQCAtNzM5LDEw
ICs3NTAsMjEgQEAKICAgICAgICAgICAgIGdvdG8gb3V0X2RwdXQ7CiAgICAgICAgIH0KIAotICAg
ICAgLyogZmlsbCB0YXJnZXQgaWQgYW5kIGNhbGwgaW50ZXJuYWwgZnVuY3Rpb24gKi8KLSAgICAg
IHRpZC5maWxlLmRldmljZSA9IHRfZGVudHJ5LT5kX2lub2RlLT5pX2RldjsKLSAgICAgIHRpZC5m
aWxlLmlub2RlICA9IHRfZGVudHJ5LT5kX2lub2RlLT5pX2lubzsKLSAgICAgIHRpZC5maWxlLmRl
bnRyeV9wID0gdF9kZW50cnk7CisgICAgICBpZih0YXJnZXQgPT0gVF9ERVYpCisgICAgICAgIHsK
KyAgICAgICAgICBpZihTX0lTQkxLKHRfZGVudHJ5LT5kX2lub2RlLT5pX21vZGUpKQorICAgICAg
ICAgICAgdGlkLmRldi50eXBlID0gRF9ibG9jazsKKyAgICAgICAgICBlbHNlCisgICAgICAgICAg
ICB0aWQuZGV2LnR5cGUgPSBEX2NoYXI7CisgICAgICAgICAgdGlkLmRldi5pZCAgPSB0X2RlbnRy
eS0+ZF9pbm9kZS0+aV9yZGV2OworICAgICAgICB9CisgICAgICBlbHNlCisgICAgICAgIHsKKyAg
ICAgICAgICAvKiBmaWxsIHRhcmdldCBpZCBhbmQgY2FsbCBpbnRlcm5hbCBmdW5jdGlvbiAqLwor
ICAgICAgICAgIHRpZC5maWxlLmRldmljZSA9IHRfZGVudHJ5LT5kX2lub2RlLT5pX2RldjsKKyAg
ICAgICAgICB0aWQuZmlsZS5pbm9kZSAgPSB0X2RlbnRyeS0+ZF9pbm9kZS0+aV9pbm87CisgICAg
ICAgICAgdGlkLmZpbGUuZGVudHJ5X3AgPSB0X2RlbnRyeTsKKyAgICAgICAgfQogICAgICAgLyog
Y2FsbCBBREYgKi8KICNpZmRlZiBDT05GSUdfUlNCQUNfREVCVUcKICAgICAgIGlmIChyc2JhY19k
ZWJ1Z19hZWYpIHByaW50ayhLRVJOX0RFQlVHICJzeXNfcnNiYWNfc2V0X2F0dHJfbigpOiBjYWxs
aW5nIEFERlxuIik7CkBAIC05NzUsMTAgKzk5NywyMSBAQAogICAgICAgICAgICAgZ290byBvdXRf
ZHB1dDsKICAgICAgICAgfQogCi0gICAgICAvKiBmaWxsIHRhcmdldCBpZCBhbmQgY2FsbCBpbnRl
cm5hbCBmdW5jdGlvbiAqLwotICAgICAgdGlkLmZpbGUuZGV2aWNlID0gdF9kZW50cnktPmRfaW5v
ZGUtPmlfZGV2OwotICAgICAgdGlkLmZpbGUuaW5vZGUgID0gdF9kZW50cnktPmRfaW5vZGUtPmlf
aW5vOwotICAgICAgdGlkLmZpbGUuZGVudHJ5X3AgPSB0X2RlbnRyeTsKKyAgICAgIGlmKHRhcmdl
dCA9PSBUX0RFVikKKyAgICAgICAgeworICAgICAgICAgIGlmKFNfSVNCTEsodF9kZW50cnktPmRf
aW5vZGUtPmlfbW9kZSkpCisgICAgICAgICAgICB0aWQuZGV2LnR5cGUgPSBEX2Jsb2NrOworICAg
ICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRpZC5kZXYudHlwZSA9IERfY2hhcjsKKyAgICAgICAg
ICB0aWQuZGV2LmlkICA9IHRfZGVudHJ5LT5kX2lub2RlLT5pX3JkZXY7CisgICAgICAgIH0KKyAg
ICAgIGVsc2UKKyAgICAgICAgeworICAgICAgICAgIC8qIGZpbGwgdGFyZ2V0IGlkIGFuZCBjYWxs
IGludGVybmFsIGZ1bmN0aW9uICovCisgICAgICAgICAgdGlkLmZpbGUuZGV2aWNlID0gdF9kZW50
cnktPmRfaW5vZGUtPmlfZGV2OworICAgICAgICAgIHRpZC5maWxlLmlub2RlICA9IHRfZGVudHJ5
LT5kX2lub2RlLT5pX2lubzsKKyAgICAgICAgICB0aWQuZmlsZS5kZW50cnlfcCA9IHRfZGVudHJ5
OworICAgICAgICB9CiAgICAgICAvKiBjYWxsIEFERiAqLwogI2lmZGVmIENPTkZJR19SU0JBQ19E
RUJVRwogICAgICAgaWYgKHJzYmFjX2RlYnVnX2FlZikgcHJpbnRrKEtFUk5fREVCVUcgInN5c19y
c2JhY19yZW1vdmVfdGFyZ2V0X24oKTogY2FsbGluZyBBREZcbiIpOwpAQCAtMTk5MSw5ICsyMDI0
LDIxIEBACiAgICAgICAgICAgICBnb3RvIG91dF9kcHV0OwogICAgICAgICB9CiAKLSAgICAgIHRp
ZC5maWxlLmRldmljZSA9IHRfZGVudHJ5LT5kX2lub2RlLT5pX3NiLT5zX2RldjsKLSAgICAgIHRp
ZC5maWxlLmlub2RlICA9IHRfZGVudHJ5LT5kX2lub2RlLT5pX2lubzsKLSAgICAgIHRpZC5maWxl
LmRlbnRyeV9wID0gdF9kZW50cnk7CisgICAgICBpZih0YXJnZXQgPT0gVF9ERVYpCisgICAgICAg
IHsKKyAgICAgICAgICBpZihTX0lTQkxLKHRfZGVudHJ5LT5kX2lub2RlLT5pX21vZGUpKQorICAg
ICAgICAgICAgdGlkLmRldi50eXBlID0gRF9ibG9jazsKKyAgICAgICAgICBlbHNlCisgICAgICAg
ICAgICB0aWQuZGV2LnR5cGUgPSBEX2NoYXI7CisgICAgICAgICAgdGlkLmRldi5pZCAgPSB0X2Rl
bnRyeS0+ZF9pbm9kZS0+aV9yZGV2OworICAgICAgICB9CisgICAgICBlbHNlCisgICAgICAgIHsK
KyAgICAgICAgICAvKiBmaWxsIHRhcmdldCBpZCBhbmQgY2FsbCBpbnRlcm5hbCBmdW5jdGlvbiAq
LworICAgICAgICAgIHRpZC5maWxlLmRldmljZSA9IHRfZGVudHJ5LT5kX2lub2RlLT5pX2RldjsK
KyAgICAgICAgICB0aWQuZmlsZS5pbm9kZSAgPSB0X2RlbnRyeS0+ZF9pbm9kZS0+aV9pbm87Cisg
ICAgICAgICAgdGlkLmZpbGUuZGVudHJ5X3AgPSB0X2RlbnRyeTsKKyAgICAgICAgfQogICAgICAg
ZXJyID0gcnNiYWNfcmNfc3lzX2dldF9lZmZfcmlnaHRzKHRhcmdldCwgdGlkLCAma19yZXFfdmVj
LCAma190dGwpOwogICAgICAgLyogcHV0IHJlc3VsdCB2YWx1ZSB0byB1c2VyIHNwYWNlICovCiAg
ICAgICBpZighZXJyKQo=

--------------Boundary-00=_LAY4V8U4GFSSXIVUHJ4B--