[rsbac] RSBAC bugfixes v1.2.1-4 and -5 uploaded

[Amon Ott]

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

4. General: Admin tool rsbac_klogd from contrib does not compile

    * What you see: When compiling the rsbac_klogd tool in the contrib dir, 
linking fails.
    * What is wrong: librsbac.a is not referenced correctly.
    * RSBAC versions affected: 1.2.1.
    * What you should do: Apply this patch to get it fixed and retry.

5. General: Booting with Initial Ramdisk (initrd) hangs

    * What you see: During boot you get RSBAC messages about unknown devices 
and access is denied.
    * What is wrong: The initial ramdisk does not get added to the RSBAC list 
of known devices.
    * RSBAC versions affected: 1.2.1.
    * What you should do: Apply this patch to get the auto-mount feature from 
1.2.2-pre, recompile the kernel, reinstall and reboot.



Amon.
--
http://www.rsbac.org - GnuPG: 2048g/5DEAAA30 2002-10-22

--------------Boundary-00=_IGCGVYH8UW1K42PBD5QC
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="rsbac-bugfix-v1.2.1-5.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="rsbac-bugfix-v1.2.1-5.diff"

LS0tIGxpbnV4LTIuNC4yMC1yc2JhYy12MS4yLjEtb3JpZy9yc2JhYy9kYXRhX3N0cnVjdHVyZXMv
YWNpX2RhdGFfc3RydWN0dXJlcy5jCTIwMDItMDktMTkgMTE6NDc6NTkuMDAwMDAwMDAwICswMjAw
CisrKyBsaW51eC0yLjQuMjAtcnNiYWMtdjEuMi4xL3JzYmFjL2RhdGFfc3RydWN0dXJlcy9hY2lf
ZGF0YV9zdHJ1Y3R1cmVzLmMJMjAwMy0wMS0wOSAxNDoxODoyMy4wMDAwMDAwMDAgKzAxMDAKQEAg
LTE1OCwxMSArMTU4LDYgQEAKIAogI2VuZGlmIC8qIFBST0MgKi8KIAotI2lmIExJTlVYX1ZFUlNJ
T05fQ09ERSA+PSBLRVJORUxfVkVSU0lPTigyLDQsMTEpCi1zdGF0aWMgc3RydWN0IHN1cGVyX2Js
b2NrICogc29ja2ZzX3NiX3AgPSBOVUxMOwotc3RhdGljIHN0cnVjdCBzdXBlcl9ibG9jayAqIHBp
cGVmc19zYl9wID0gTlVMTDsKLSNlbmRpZgotCiAjaWYgTElOVVhfVkVSU0lPTl9DT0RFID49IEtF
Uk5FTF9WRVJTSU9OKDIsNCwwKQogI2lmZGVmIENPTkZJR19ERVZGU19NT1VOVAogI2luY2x1ZGUg
PGxpbnV4L2RldmZzX2ZzX2tlcm5lbC5oPgpAQCAtMTYxNiwxMSArMTYxMSwzNSBAQAogICAgIGRl
dmljZV9wID0gbG9va3VwX2RldmljZShrZGV2KTsKICAgICBpZiAoIWRldmljZV9wKQogICAgICAg
ewotICAgICAgICBwcmludGsoS0VSTl9XQVJOSU5HCi0gICAgICAgICAgICAgICAicnNiYWNfZ2V0
X3N1cGVyX2Jsb2NrKCk6IHVua25vd24gZGV2aWNlICUwMnU6JTAydVxuIiwKLSAgICAgICAgICAg
ICAgIE1BSk9SKGtkZXYpLCBNSU5PUihrZGV2KSk7CiAgICAgICAgIHJzYmFjX3JlYWRfdW5sb2Nr
KCZkZXZpY2VfbGlzdF9oZWFkLmxvY2ssICZkZmxhZ3MpOwotICAgICAgICByZXR1cm4gTlVMTDsK
KyAgICAgICAgc2JfcCA9IGdldF9zdXBlcihrZGV2KTsKKyAgICAgICAgaWYoc2JfcCkKKyAgICAg
ICAgICB7CisgICAgICAgICAgICBwcmludGsoS0VSTl9JTkZPCisgICAgICAgICAgICAgICAgICAg
InJzYmFjX2dldF9zdXBlcl9ibG9jaygpOiBhdXRvLW1vdW50aW5nIGRldmljZSAlMDJ1OiUwMnVc
biIsCisgICAgICAgICAgICAgICAgICAgTUFKT1Ioa2RldiksIE1JTk9SKGtkZXYpKTsKKyNpZiBM
SU5VWF9WRVJTSU9OX0NPREUgPCBLRVJORUxfVkVSU0lPTigyLDQsMCkKKyAgICAgICAgICAgIHJz
YmFjX21vdW50KHNiX3ApOworI2Vsc2UKKyAgICAgICAgICAgIHJzYmFjX21vdW50KHNiX3AsIE5V
TEwpOworI2VuZGlmCisjaWYgTElOVVhfVkVSU0lPTl9DT0RFID49IEtFUk5FTF9WRVJTSU9OKDIs
NCw4KQorICAgICAgICAgICAgLyogZnJlZSBzdXBlcl9ibG9jayBwb2ludGVyICovCisgICAgICAg
ICAgICBkcm9wX3N1cGVyKHNiX3ApOworI2VuZGlmCisgICAgICAgICAgICByc2JhY19yZWFkX2xv
Y2soJmRldmljZV9saXN0X2hlYWQubG9jaywgJmRmbGFncyk7CisgICAgICAgICAgICBkZXZpY2Vf
cCA9IGxvb2t1cF9kZXZpY2Uoa2Rldik7CisgICAgICAgICAgICBpZiAoIWRldmljZV9wKQorICAg
ICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgcHJpbnRrKEtFUk5fV0FSTklORworICAgICAg
ICAgICAgICAgICAgICAgICAicnNiYWNfZ2V0X3N1cGVyX2Jsb2NrKCk6IHVua25vd24gZGV2aWNl
ICUwMnU6JTAydVxuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgTUFKT1Ioa2RldiksIE1JTk9S
KGtkZXYpKTsKKyAgICAgICAgICAgICAgICByc2JhY19yZWFkX3VubG9jaygmZGV2aWNlX2xpc3Rf
aGVhZC5sb2NrLCAmZGZsYWdzKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gTlVMTDsKKyAgICAg
ICAgICAgICAgfQorICAgICAgICAgIH0KKyAgICAgICAgZWxzZQorICAgICAgICAgIHJldHVybiBO
VUxMOwogICAgICAgfQogICAgIHNiX3AgPSBkZXZpY2VfcC0+c2JfcDsKICAgICByc2JhY19yZWFk
X3VubG9jaygmZGV2aWNlX2xpc3RfaGVhZC5sb2NrLCAmZGZsYWdzKTsKQEAgLTY3NzcsMjEgKzY3
OTYsNiBAQAogICAgICNlbmRpZgogICAgICNlbmRpZgogCi0gICAgI2lmIExJTlVYX1ZFUlNJT05f
Q09ERSA+PSBLRVJORUxfVkVSU0lPTigyLDQsMTEpCi0gICAgaWYoc29ja2ZzX3NiX3ApCi0gICAg
ICB7Ci0gICAgICAgIHByaW50ayhLRVJOX1dBUk5JTkcgInJzYmFjX2RvX2luaXQoKTogYXV0b21v
dW50aW5nIHNvY2tmcyBkZXZpY2UgJTAydTolMDJ1XG4iLAotICAgICAgICAgICAgICAgTUFKT1Io
c29ja2ZzX3NiX3AtPnNfZGV2KSwgTUlOT1Ioc29ja2ZzX3NiX3AtPnNfZGV2KSk7Ci0gICAgICAg
IHJzYmFjX21vdW50KHNvY2tmc19zYl9wLCBOVUxMKTsKLSAgICAgIH0KLSAgICBpZihwaXBlZnNf
c2JfcCkKLSAgICAgIHsKLSAgICAgICAgcHJpbnRrKEtFUk5fV0FSTklORyAicnNiYWNfZG9faW5p
dCgpOiBhdXRvbW91bnRpbmcgcGlwZWZzIGRldmljZSAlMDJ1OiUwMnVcbiIsCi0gICAgICAgICAg
ICAgICBNQUpPUihwaXBlZnNfc2JfcC0+c19kZXYpLCBNSU5PUihwaXBlZnNfc2JfcC0+c19kZXYp
KTsKLSAgICAgICAgcnNiYWNfbW91bnQocGlwZWZzX3NiX3AsIE5VTEwpOwotICAgICAgfQotICAg
ICNlbmRpZgotCiAvKiBGb3JjZSBhIGNoZWNrLCBpZiBjb25maWd1cmVkICovCiAjaWZkZWYgQ09O
RklHX1JTQkFDX0lOSVRfQ0hFQ0sKICNpZmRlZiBDT05GSUdfUlNCQUNfREVCVUcKQEAgLTcxMDIs
MjAgKzcxMDYsNyBAQAogICAgICAgICBwcmludGsoS0VSTl9XQVJOSU5HCiAgICAgICAgICAgICAg
ICAicnNiYWNfbW91bnQoKTogUlNCQUMgbm90IGluaXRpYWxpemVkIHdoaWxlIG1vdW50aW5nIERF
ViAlMDJ1OiUwMnUsIGRlbGF5aW5nXG4iLAogICAgICAgICAgICAgICAgTUFKT1Ioc2JfcC0+c19k
ZXYpLCBNSU5PUihzYl9wLT5zX2RldikpOwotICAgICAgICAjaWYgTElOVVhfVkVSU0lPTl9DT0RF
ID49IEtFUk5FTF9WRVJTSU9OKDIsNCwxMSkKLSAgICAgICAgaWYoc2JfcC0+c19tYWdpYyA9PSBT
T0NLRlNfTUFHSUMpCi0gICAgICAgICAgewotICAgICAgICAgICAgcHJpbnRrKEtFUk5fV0FSTklO
RwotICAgICAgICAgICAgICAgICAgICJyc2JhY19tb3VudCgpOiBzb2NrZnMgbW91bnQgZGV0ZWN0
ZWQsIGtlZXBpbmcgdmFsdWVzIGZvciBsYXRlciB1c2VcbiIpOwotICAgICAgICAgICAgc29ja2Zz
X3NiX3AgPSBzYl9wOwotICAgICAgICAgIH0KLSAgICAgICAgaWYoc2JfcC0+c19tYWdpYyA9PSBQ
SVBFRlNfTUFHSUMpCi0gICAgICAgICAgewotICAgICAgICAgICAgcHJpbnRrKEtFUk5fV0FSTklO
RwotICAgICAgICAgICAgICAgICAgICJyc2JhY19tb3VudCgpOiBwaXBlZnMgbW91bnQgZGV0ZWN0
ZWQsIGtlZXBpbmcgdmFsdWVzIGZvciBsYXRlciB1c2VcbiIpOwotICAgICAgICAgICAgcGlwZWZz
X3NiX3AgPSBzYl9wOwotICAgICAgICAgIH0KLSAgICAgICAgI2VuZGlmCisKICAgICAgICAgI2lm
IExJTlVYX1ZFUlNJT05fQ09ERSA+PSBLRVJORUxfVkVSU0lPTigyLDQsMCkKICAgICAgICAgI2lm
ZGVmIENPTkZJR19ERVZGU19NT1VOVAogICAgICAgICBpZihzYl9wLT5zX21hZ2ljID09IERFVkZT
X1NVUEVSX01BR0lDKQpAQCAtNzEyNyw3ICs3MTE4LDYgQEAKICAgICAgICAgICB9CiAgICAgICAg
ICNlbmRpZgogICAgICAgICAjZW5kaWYKLQogICAgICAgICByZXR1cm4oLVJTQkFDX0VOT1RJTklU
SUFMSVpFRCk7CiAgICAgICB9CiAjaWZkZWYgQ09ORklHX1JTQkFDX0RFQlVHCkBAIC03Mzc1LDE0
ICs3MzY1LDE0IEBACiAgICAgICAgICAgICAgICAgZGV2aWNlX3AtPm1vdW50X2NvdW50LS07CiAg
ICAgICAgICAgICAgICAgaWYoZGV2aWNlX3AtPmRfY292ZXJzID09IGRfY292ZXJzKQogICAgICAg
ICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBwcmludGsoS0VSTl9XQVJOSU5HICJy
c2JhY19tb3VudDogcmVtb3ZlZCBwcmltYXJ5IG1vdW50IGZvciBkZXZpY2UgJTAydTolMDJ1LCBp
bmhlcml0YW5jZSBicm9rZW4hXG4iLAorICAgICAgICAgICAgICAgICAgICBwcmludGsoS0VSTl9X
QVJOSU5HICJyc2JhY191bW91bnQ6IHJlbW92ZWQgcHJpbWFyeSBtb3VudCBmb3IgZGV2aWNlICUw
MnU6JTAydSwgaW5oZXJpdGFuY2UgYnJva2VuIVxuIiwKICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIE1BSk9SKHNiX3AtPnNfZGV2KSwgTUlOT1Ioc2JfcC0+c19kZXYpKTsKICAgICAgICAgICAg
ICAgICAgICAgZGV2aWNlX3AtPmRfY292ZXJzID0gTlVMTDsKICAgICAgICAgICAgICAgICAgIH0K
ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICB7Ci0gICAg
ICAgICAgICAgICAgcHJpbnRrKEtFUk5fV0FSTklORyAicnNiYWNfbW91bnQ6IGRldmljZSAlMDJ1
OiUwMnUgaGFzIG1vdW50X2NvdW50IDwgMSFcbiIsCisgICAgICAgICAgICAgICAgcHJpbnRrKEtF
Uk5fV0FSTklORyAicnNiYWNfdW1vdW50OiBkZXZpY2UgJTAydTolMDJ1IGhhcyBtb3VudF9jb3Vu
dCA8IDEhXG4iLAogICAgICAgICAgICAgICAgICAgICAgICBNQUpPUihzYl9wLT5zX2RldiksIE1J
Tk9SKHNiX3AtPnNfZGV2KSk7CiAgICAgICAgICAgICAgIH0KICAgICAgICAgICB9CkBAIC04Nzky
LDEyICs4NzgyLDM3IEBACiAgICAgICAgICAgICBkZXZpY2VfcCA9IGxvb2t1cF9kZXZpY2UodGlk
LmZpbGUuZGV2aWNlKTsKICAgICAgICAgICAgIGlmICghZGV2aWNlX3ApCiAgICAgICAgICAgICAg
IHsKLSAgICAgICAgICAgICAgICBwcmludGsoS0VSTl9XQVJOSU5HCi0gICAgICAgICAgICAgICAg
ICAgICAgICJyc2JhY19nZXRfYXR0cigpOiBDb3VsZCBub3QgbG9va3VwIGRldmljZSAlMDJ1OiUw
MnUhXG4iLAotICAgICAgICAgICAgICAgICAgICAgICBNQUpPUih0aWQuZmlsZS5kZXZpY2UpLCBN
SU5PUih0aWQuZmlsZS5kZXZpY2UpKTsKLSAgICAgICAgICAgICAgICAvKiBmcmVlIHJlYWQgbG9j
ayAqLworICAgICAgICAgICAgICAgIHN0cnVjdCBzdXBlcl9ibG9jayAqIHNiX3A7CisKICAgICAg
ICAgICAgICAgICByc2JhY19yZWFkX3VubG9jaygmZGV2aWNlX2xpc3RfaGVhZC5sb2NrLCAmZGZs
YWdzKTsKLSAgICAgICAgICAgICAgICByZXR1cm4oLVJTQkFDX0VJTlZBTElEREVWKTsKKyAgICAg
ICAgICAgICAgICBzYl9wID0gZ2V0X3N1cGVyKHRpZC5maWxlLmRldmljZSk7CisgICAgICAgICAg
ICAgICAgaWYoc2JfcCkKKyAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAg
cHJpbnRrKEtFUk5fSU5GTworICAgICAgICAgICAgICAgICAgICAgICAgICAgInJzYmFjX2dldF9h
dHRyKCk6IGF1dG8tbW91bnRpbmcgZGV2aWNlICUwMnU6JTAydVxuIiwKKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgIE1BSk9SKHRpZC5maWxlLmRldmljZSksIE1JTk9SKHRpZC5maWxlLmRldmlj
ZSkpOworI2lmIExJTlVYX1ZFUlNJT05fQ09ERSA8IEtFUk5FTF9WRVJTSU9OKDIsNCwwKQorICAg
ICAgICAgICAgICAgICAgICByc2JhY19tb3VudChzYl9wKTsKKyNlbHNlCisgICAgICAgICAgICAg
ICAgICAgIHJzYmFjX21vdW50KHNiX3AsIE5VTEwpOworI2VuZGlmCisjaWYgTElOVVhfVkVSU0lP
Tl9DT0RFID49IEtFUk5FTF9WRVJTSU9OKDIsNCw4KQorICAgICAgICAgICAgICAgICAgICAvKiBm
cmVlIHN1cGVyX2Jsb2NrIHBvaW50ZXIgKi8KKyAgICAgICAgICAgICAgICAgICAgZHJvcF9zdXBl
cihzYl9wKTsKKyNlbmRpZgorICAgICAgICAgICAgICAgICAgICByc2JhY19yZWFkX2xvY2soJmRl
dmljZV9saXN0X2hlYWQubG9jaywgJmRmbGFncyk7CisgICAgICAgICAgICAgICAgICAgIGRldmlj
ZV9wID0gbG9va3VwX2RldmljZSh0aWQuZmlsZS5kZXZpY2UpOworICAgICAgICAgICAgICAgICAg
ICBpZiAoIWRldmljZV9wKQorICAgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg
ICAgICAgICAgIHByaW50ayhLRVJOX1dBUk5JTkcKKyAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAicnNiYWNfZ2V0X2F0dHIoKTogdW5rbm93biBkZXZpY2UgJTAydTolMDJ1XG4iLAorICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1BSk9SKHRpZC5maWxlLmRldmljZSksIE1JTk9S
KHRpZC5maWxlLmRldmljZSkpOworICAgICAgICAgICAgICAgICAgICAgICAgcnNiYWNfcmVhZF91
bmxvY2soJmRldmljZV9saXN0X2hlYWQubG9jaywgJmRmbGFncyk7CisgICAgICAgICAgICAgICAg
ICAgICAgICByZXR1cm4gLVJTQkFDX0VJTlZBTElEREVWOworICAgICAgICAgICAgICAgICAgICAg
IH0KKyAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAg
ICAgICAgICByZXR1cm4gLVJTQkFDX0VJTlZBTElEREVWOwogICAgICAgICAgICAgICB9CiAgICAg
ICAgICAgICBzd2l0Y2gobW9kdWxlKQogICAgICAgICAgICAgICB7CkBAIC0xMDc0NCwxMSArMTA3
NTksMzcgQEAKICAgICAgICAgICAgIGRldmljZV9wID0gbG9va3VwX2RldmljZSh0aWQuZmlsZS5k
ZXZpY2UpOwogICAgICAgICAgICAgaWYgKCFkZXZpY2VfcCkKICAgICAgICAgICAgICAgewotICAg
ICAgICAgICAgICAgIHByaW50ayhLRVJOX1dBUk5JTkcKLSAgICAgICAgICAgICAgICAgICAgICAg
InJzYmFjX3NldF9hdHRyKCk6IENvdWxkIG5vdCBsb29rdXAgZGV2aWNlIVxuIik7Ci0gICAgICAg
ICAgICAgICAgLyogZnJlZSByZWFkIGxvY2sgKi8KKyAgICAgICAgICAgICAgICBzdHJ1Y3Qgc3Vw
ZXJfYmxvY2sgKiBzYl9wOworCiAgICAgICAgICAgICAgICAgcnNiYWNfcmVhZF91bmxvY2soJmRl
dmljZV9saXN0X2hlYWQubG9jaywgJmRmbGFncyk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuKC1S
U0JBQ19FSU5WQUxJRERFVik7CisgICAgICAgICAgICAgICAgc2JfcCA9IGdldF9zdXBlcih0aWQu
ZmlsZS5kZXZpY2UpOworICAgICAgICAgICAgICAgIGlmKHNiX3ApCisgICAgICAgICAgICAgICAg
ICB7CisgICAgICAgICAgICAgICAgICAgIHByaW50ayhLRVJOX0lORk8KKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgICJyc2JhY19zZXRfYXR0cigpOiBhdXRvLW1vdW50aW5nIGRldmljZSAlMDJ1
OiUwMnVcbiIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBNQUpPUih0aWQuZmlsZS5kZXZp
Y2UpLCBNSU5PUih0aWQuZmlsZS5kZXZpY2UpKTsKKyNpZiBMSU5VWF9WRVJTSU9OX0NPREUgPCBL
RVJORUxfVkVSU0lPTigyLDQsMCkKKyAgICAgICAgICAgICAgICAgICAgcnNiYWNfbW91bnQoc2Jf
cCk7CisjZWxzZQorICAgICAgICAgICAgICAgICAgICByc2JhY19tb3VudChzYl9wLCBOVUxMKTsK
KyNlbmRpZgorI2lmIExJTlVYX1ZFUlNJT05fQ09ERSA+PSBLRVJORUxfVkVSU0lPTigyLDQsOCkK
KyAgICAgICAgICAgICAgICAgICAgLyogZnJlZSBzdXBlcl9ibG9jayBwb2ludGVyICovCisgICAg
ICAgICAgICAgICAgICAgIGRyb3Bfc3VwZXIoc2JfcCk7CisjZW5kaWYKKyAgICAgICAgICAgICAg
ICAgICAgcnNiYWNfcmVhZF9sb2NrKCZkZXZpY2VfbGlzdF9oZWFkLmxvY2ssICZkZmxhZ3MpOwor
ICAgICAgICAgICAgICAgICAgICBkZXZpY2VfcCA9IGxvb2t1cF9kZXZpY2UodGlkLmZpbGUuZGV2
aWNlKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFkZXZpY2VfcCkKKyAgICAgICAgICAgICAg
ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICBwcmludGsoS0VSTl9XQVJOSU5HCisg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInJzYmFjX3NldF9hdHRyKCk6IHVua25vd24g
ZGV2aWNlICUwMnU6JTAydVxuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNQUpP
Uih0aWQuZmlsZS5kZXZpY2UpLCBNSU5PUih0aWQuZmlsZS5kZXZpY2UpKTsKKyAgICAgICAgICAg
ICAgICAgICAgICAgIHJzYmFjX3JlYWRfdW5sb2NrKCZkZXZpY2VfbGlzdF9oZWFkLmxvY2ssICZk
ZmxhZ3MpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIC1SU0JBQ19FSU5WQUxJRERF
VjsKKyAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICB9CisgICAgICAg
ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgcmV0dXJuIC1SU0JBQ19FSU5WQUxJRERF
VjsKICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgc3dpdGNoKG1vZHVsZSkKICAgICAgICAg
ICAgICAgewpAQCAtMTI0OTgsOCArMTI1MzksNDAgQEAKIAogICAgICAgICAgICAgLyogbG9va3Vw
IGRldmljZSAqLwogICAgICAgICAgICAgZGV2aWNlX3AgPSBsb29rdXBfZGV2aWNlKHRpZC5maWxl
LmRldmljZSk7Ci0gICAgICAgICAgICBpZiAoZGV2aWNlX3ApCisgICAgICAgICAgICBpZiAoIWRl
dmljZV9wKQogICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgc3RydWN0IHN1cGVyX2Js
b2NrICogc2JfcDsKKworICAgICAgICAgICAgICAgIHJzYmFjX3JlYWRfdW5sb2NrKCZkZXZpY2Vf
bGlzdF9oZWFkLmxvY2ssICZkZmxhZ3MpOworICAgICAgICAgICAgICAgIHNiX3AgPSBnZXRfc3Vw
ZXIodGlkLmZpbGUuZGV2aWNlKTsKKyAgICAgICAgICAgICAgICBpZihzYl9wKQorICAgICAgICAg
ICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICBwcmludGsoS0VSTl9JTkZPCisgICAgICAg
ICAgICAgICAgICAgICAgICAgICAicnNiYWNfcmVtb3ZlX3RhcmdldCgpOiBhdXRvLW1vdW50aW5n
IGRldmljZSAlMDJ1OiUwMnVcbiIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBNQUpPUih0
aWQuZmlsZS5kZXZpY2UpLCBNSU5PUih0aWQuZmlsZS5kZXZpY2UpKTsKKyNpZiBMSU5VWF9WRVJT
SU9OX0NPREUgPCBLRVJORUxfVkVSU0lPTigyLDQsMCkKKyAgICAgICAgICAgICAgICAgICAgcnNi
YWNfbW91bnQoc2JfcCk7CisjZWxzZQorICAgICAgICAgICAgICAgICAgICByc2JhY19tb3VudChz
Yl9wLCBOVUxMKTsKKyNlbmRpZgorI2lmIExJTlVYX1ZFUlNJT05fQ09ERSA+PSBLRVJORUxfVkVS
U0lPTigyLDQsOCkKKyAgICAgICAgICAgICAgICAgICAgLyogZnJlZSBzdXBlcl9ibG9jayBwb2lu
dGVyICovCisgICAgICAgICAgICAgICAgICAgIGRyb3Bfc3VwZXIoc2JfcCk7CisjZW5kaWYKKyAg
ICAgICAgICAgICAgICAgICAgcnNiYWNfcmVhZF9sb2NrKCZkZXZpY2VfbGlzdF9oZWFkLmxvY2ss
ICZkZmxhZ3MpOworICAgICAgICAgICAgICAgICAgICBkZXZpY2VfcCA9IGxvb2t1cF9kZXZpY2Uo
dGlkLmZpbGUuZGV2aWNlKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFkZXZpY2VfcCkKKyAg
ICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICBwcmludGsoS0VS
Tl9XQVJOSU5HCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInJzYmFjX3JlbW92ZV90
YXJnZXQoKTogdW5rbm93biBkZXZpY2UgJTAydTolMDJ1XG4iLAorICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgIE1BSk9SKHRpZC5maWxlLmRldmljZSksIE1JTk9SKHRpZC5maWxlLmRldmlj
ZSkpOworICAgICAgICAgICAgICAgICAgICAgICAgcnNiYWNfcmVhZF91bmxvY2soJmRldmljZV9s
aXN0X2hlYWQubG9jaywgJmRmbGFncyk7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4g
LVJTQkFDX0VJTlZBTElEREVWOworICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg
ICAgICAgIH0KKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICByZXR1cm4g
LVJTQkFDX0VJTlZBTElEREVWOworICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcnNi
YWNfbGlzdF9yZW1vdmUoZGV2aWNlX3AtPmhhbmRsZXMuZ2VuW2dlbl9mZF9oYXNoKHRpZC5maWxl
Lmlub2RlKV0sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnRpZC5maWxlLmlu
b2RlKTsKICNpZiBkZWZpbmVkKENPTkZJR19SU0JBQ19NQUMpCkBAIC0xMjU0MCw5ICsxMjYxMyw2
IEBACiAgICAgICAgICAgICAgICAgcnNiYWNfbGlzdF9yZW1vdmUoZGV2aWNlX3AtPmhhbmRsZXMu
Y2FwW2NhcF9mZF9oYXNoKHRpZC5maWxlLmlub2RlKV0sCiAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgJnRpZC5maWxlLmlub2RlKTsKICNlbmRpZgotICAgICAgICAgICAgICB9Ci0g
ICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgIGVycm9yID0gLVJTQkFDX0VJTlZBTElEREVW
OwogCiAgICAgICAgICAgICAvKiBmcmVlIGFjY2VzcyB0byBkZXZpY2VfbGlzdF9oZWFkICovCiAg
ICAgICAgICAgICByc2JhY19yZWFkX3VubG9jaygmZGV2aWNlX2xpc3RfaGVhZC5sb2NrLCAmZGZs
YWdzKTsKLS0tIGxpbnV4LTIuNC4yMC1yc2JhYy12MS4yLjEtb3JpZy9yc2JhYy9kYXRhX3N0cnVj
dHVyZXMvZ2VuX2xpc3RzLmMJMjAwMi0wOC0yOSAxMDowMjowMC4wMDAwMDAwMDAgKzAyMDAKKysr
IGxpbnV4LTIuNC4yMC1yc2JhYy12MS4yLjEvcnNiYWMvZGF0YV9zdHJ1Y3R1cmVzL2dlbl9saXN0
cy5jCTIwMDMtMDEtMDYgMTA6MjY6MzcuMDAwMDAwMDAwICswMTAwCkBAIC0zNTYyLDcgKzM1NjIs
NyBAQAogICAgICAgICAgICAgICAgIGlmKHN1YmNvdW50ICE9IC1SU0JBQ19FTk9UV1JJVEFCTEUp
CiAgICAgICAgICAgICAgICAgICBwcmludGsoS0VSTl9XQVJOSU5HCiAgICAgICAgICAgICAgICAg
ICAgICAgICAgInJzYmFjX3dyaXRlX2xpc3RzKCk6IHdyaXRlX2xpc3QoKSBmb3IgbGlzdCBvZiBs
aXN0cyAlcyByZXR1cm5lZCBlcnJvciAlaVxuIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICBp
dGVtX3AtPm5hbWUsIHN1YmNvdW50KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICBsb2xfaXRl
bV9wLT5uYW1lLCBzdWJjb3VudCk7CiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGVsc2UK
ICAgICAgICAgICAgICAgY291bnQrKzsK

--------------Boundary-00=_IGCGVYH8UW1K42PBD5QC
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="rsbac-bugfix-v1.2.1-4.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="rsbac-bugfix-v1.2.1-4.diff"

LS0tIHJzYmFjLWFkbWluLXYxLjIuMS9jb250cmliL3JzYmFjLWtsb2dkLTIuMC9zcmMvTWFrZWZp
bGUuaW4JTW9uIFNlcCAyMyAxMToxMTowOCAyMDAyCisrKyByc2JhYy1hZG1pbi12MS4yLjIvY29u
dHJpYi9yc2JhYy1rbG9nZC0yLjAvc3JjL01ha2VmaWxlLmluCVdlZCBEZWMgIDQgMDk6NTY6MDYg
MjAwMgpAQCAtMSw2ICsxLDYgQEAKLSMgTWFrZWZpbGUuaW4gZ2VuZXJhdGVkIGF1dG9tYXRpY2Fs
bHkgYnkgYXV0b21ha2UgMS40LXA1IGZyb20gTWFrZWZpbGUuYW0KKyMgTWFrZWZpbGUuaW4gZ2Vu
ZXJhdGVkIGF1dG9tYXRpY2FsbHkgYnkgYXV0b21ha2UgMS40LXA0IGZyb20gTWFrZWZpbGUuYW0K
IAotIyBDb3B5cmlnaHQgKEMpIDE5OTQsIDE5OTUtOCwgMTk5OSwgMjAwMSBGcmVlIFNvZnR3YXJl
IEZvdW5kYXRpb24sIEluYy4KKyMgQ29weXJpZ2h0IChDKSAxOTk0LCAxOTk1LTgsIDE5OTkgRnJl
ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCiAjIFRoaXMgTWFrZWZpbGUuaW4gaXMgZnJlZSBz
b2Z0d2FyZTsgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbgogIyBnaXZlcyB1bmxpbWl0ZWQg
cGVybWlzc2lvbiB0byBjb3B5IGFuZC9vciBkaXN0cmlidXRlIGl0LAogIyB3aXRoIG9yIHdpdGhv
dXQgbW9kaWZpY2F0aW9ucywgYXMgbG9uZyBhcyB0aGlzIG5vdGljZSBpcyBwcmVzZXJ2ZWQuCkBA
IC02NSwxMCArNjUsMTEgQEAKIAogTE9DQUxFRElSID0gJChkYXRhZGlyKS9sb2NhbGUKIElOQ0xV
REVTID0gLUkkKEtFUk5FTF9ESVIpL2luY2x1ZGUgLURWRVJTSU9OPVwidiQoVkVSU0lPTilcIiAg
LURMT0NBTEVESVI9XCIkKExPQ0FMRURJUilcIiAtRFBBQ0tBR0U9XCIkKFBBQ0tBR0UpXCIgLURD
T05GSUdfUlNCQUMKLUxERkxBR1MgPSAtbHJzYmFjCitSU0JBQ0xJQiA9IC4uLy4uLy4uL3NyYy9s
aWJyc2JhYy5hCitMREFERCA9ICQoUlNCQUNMSUIpCiAKIHNiaW5fUFJPR1JBTVMgPSBya2xvZ2QK
LXJrbG9nZF9TT1VSQ0VTID0gcmtsb2dkLmMgcGlkZmlsZS5jCitya2xvZ2RfU09VUkNFUyA9IHJr
bG9nZC5jIHBpZGZpbGUuYyAkKFJTQkFDTElCKQogbWtpbnN0YWxsZGlycyA9ICQoU0hFTEwpICQo
dG9wX3NyY2RpcikvbWtpbnN0YWxsZGlycwogQ09ORklHX0hFQURFUiA9IC4uL2NvbmZpZy5oCiBD
T05GSUdfQ0xFQU5fRklMRVMgPSAKQEAgLTc3LDEwICs3OCwxMSBAQAogCiBERUZTID0gQERFRlNA
IC1JLiAtSSQoc3JjZGlyKSAtSS4uCiBDUFBGTEFHUyA9IEBDUFBGTEFHU0AKK0xERkxBR1MgPSBA
TERGTEFHU0AKIExJQlMgPSBATElCU0AKIHJrbG9nZF9PQkpFQ1RTID0gIHJrbG9nZC5vIHBpZGZp
bGUubwogcmtsb2dkX0xEQUREID0gJChMREFERCkKLXJrbG9nZF9ERVBFTkRFTkNJRVMgPSAKK3Jr
bG9nZF9ERVBFTkRFTkNJRVMgPSAgLi4vLi4vLi4vc3JjL2xpYnJzYmFjLmEKIHJrbG9nZF9MREZM
QUdTID0gCiBDRkxBR1MgPSBAQ0ZMQUdTQAogQ09NUElMRSA9ICQoQ0MpICQoREVGUykgJChJTkNM
VURFUykgJChBTV9DUFBGTEFHUykgJChDUFBGTEFHUykgJChBTV9DRkxBR1MpICQoQ0ZMQUdTKQo=

--------------Boundary-00=_IGCGVYH8UW1K42PBD5QC--