mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for BZ# 230011 (https://bugzilla.novell.com/show_bug.cgi?id=230011) - add checks for passing "" or NULL as hatname in the ChangeHatValve and JNI changehat wrapper function

Browse source
This commit is contained in:
Dominic Reynolds 2006-12-20 18:00:14 +00:00
parent 0e969aa582
commit 967d5a4f87
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changehat/tomcat_apparmor/tomcat_5_0/src/com/novell/apparmor/catalina/valves/ChangeHatValve.java
View file

@ -155,9 +155,14 @@ public final class ChangeHatValve extends ValveBase {
*/ */
cookie = getCookie(); cookie = getCookie();
if ( hatname == null || "".equals(hatname) ) {
hatname = ChangeHatValve.DEFAULT_HAT;
}
container.getLogger().log("[APPARMOR] ChangeHat to [" + hatname container.getLogger().log("[APPARMOR] ChangeHat to [" + hatname
+ "] cookie [" + cookie + "]", container.getLogger().DEBUG); + "] cookie [" + cookie + "]", container.getLogger().DEBUG);
result = changehat_wrapper.changehat_in(hatname, cookie); result = changehat_wrapper.changehat_in(hatname, cookie);
if ( result == JNIChangeHat.EPERM ) { if ( result == JNIChangeHat.EPERM ) {
container.getLogger().log("[APPARMOR] change_hat valve " + container.getLogger().log("[APPARMOR] change_hat valve " +
"configured but Tomcat process is not confined by an " + "configured but Tomcat process is not confined by an " +

7
changehat/tomcat_apparmor/tomcat_5_0/src/jni_src/JNIChangeHat.c
View file

@ -22,8 +22,13 @@ JNIEXPORT jint Java_com_novell_apparmor_JNIChangeHat_changehat_1in
(JNIEnv *env, jobject obj, jstring hatnameUTF, jint token) (JNIEnv *env, jobject obj, jstring hatnameUTF, jint token)
{ {
int len = (*env)->GetStringLength(env, hatnameUTF); int len;
jint result = 0; jint result = 0;
if ( hatnameUTF == NULL ) {
return ( EINVAL );
}
len = (*env)->GetStringLength(env, hatnameUTF);
if ( len > 0 ) { if ( len > 0 ) {
if ( len > 128 ) { if ( len > 128 ) {
len = 128; len = 128;