libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disabled --allow_emulated_drives in setuid runs

Browse Source
This commit is contained in:
Thomas Schmitt 2007-09-26 15:53:43 +00:00
parent 011ba599cd
commit 24d6db4b64
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cdrskin/cdrskin.1
View File

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH CDRSKIN 1 "September 19, 2007" .TH CDRSKIN 1 "September 26, 2007"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -285,6 +285,9 @@ The target file address is given after prefix "stdio:".
.br .br
E.g.: dev=stdio:/tmp/my_pseudo_drive E.g.: dev=stdio:/tmp/my_pseudo_drive
.br .br
Note: --allow_emulated_drives will not work if cdrskin has changed user
identity via the setuid bit of its access permissions.
.br
Warning: Superusers must take care not to spoil their hard disk via its raw Warning: Superusers must take care not to spoil their hard disk via its raw
block device (like /dev/hda or /dev/sd0). block device (like /dev/hda or /dev/sd0).
.br .br

29
cdrskin/cdrskin.c
View File

@ -1946,6 +1946,16 @@ int Cdrpreskin_queue_msgs(struct CdrpreskiN *o, int flag)
} }
int Cdrpreskin_consider_normal_user(int flag)
{
fprintf(stderr,
"cdrskin: HINT : Consider to allow rw-access to the writer devices and\n");
fprintf(stderr,
"cdrskin: HINT : to run cdrskin under your normal user identity.\n");
return(1);
}
/* Start the fallback program as replacement of the cdrskin run. /* Start the fallback program as replacement of the cdrskin run.
@param flag bit0=do not report start command @param flag bit0=do not report start command
*/ */
@ -1959,10 +1969,7 @@ int Cdrpreskin_fallback(struct CdrpreskiN *preskin, int argc, char **argv,
if(getuid()!=geteuid() && !preskin->allow_setuid) { if(getuid()!=geteuid() && !preskin->allow_setuid) {
fprintf(stderr, fprintf(stderr,
"cdrskin: SORRY : uid and euid differ. Will not start external fallback program.\n"); "cdrskin: SORRY : uid and euid differ. Will not start external fallback program.\n");
fprintf(stderr, Cdrpreskin_consider_normal_user(0);
"cdrskin: HINT : Consider to allow rw-access to the writer device and\n");
fprintf(stderr,
"cdrskin: HINT : to run cdrskin under your normal user identity.\n");
fprintf(stderr, fprintf(stderr,
"cdrskin: HINT : Option --allow_setuid disables this safety check.\n"); "cdrskin: HINT : Option --allow_setuid disables this safety check.\n");
goto failure; goto failure;
@ -2213,6 +2220,11 @@ return:
o->abort_handler= 3; o->abort_handler= 3;
} else if(strcmp(argv[i],"--allow_emulated_drives")==0) { } else if(strcmp(argv[i],"--allow_emulated_drives")==0) {
if(getuid()!=geteuid()) {
fprintf(stderr,
"cdrskin: SORRY : uid and euid differ. Will not --allow_emulated_drives\n");
Cdrpreskin_consider_normal_user(0);
} else
o->allow_emulated_drives= 1; o->allow_emulated_drives= 1;
} else if(strcmp(argv[i],"--allow_setuid")==0) { } else if(strcmp(argv[i],"--allow_setuid")==0) {
@ -6538,10 +6550,7 @@ sorry_failed_to_eject:;
if(getuid()!=geteuid()) { if(getuid()!=geteuid()) {
fprintf(stderr, fprintf(stderr,
"cdrskin: SORRY : uid and euid differ. Will not start external eject.\n"); "cdrskin: SORRY : uid and euid differ. Will not start external eject.\n");
fprintf(stderr, Cdrpreskin_consider_normal_user(0);
"cdrskin: HINT : Consider to allow rw-access to the writer device and\n");
fprintf(stderr,
"cdrskin: HINT : to run cdrskin under your normal user identity.\n");
return(0); return(0);
} }
@ -7534,6 +7543,10 @@ int Cdrskin_create(struct CdrskiN **o, struct CdrpreskiN **preskin,
(*preskin)->demands_cdrskin_caps= 1; (*preskin)->demands_cdrskin_caps= 1;
} else { } else {
fprintf(stderr,"cdrskin: SORRY : dev=stdio:... works only with option --allow_emulated_drives\n"); fprintf(stderr,"cdrskin: SORRY : dev=stdio:... works only with option --allow_emulated_drives\n");
if(getuid()!=geteuid()) {
fprintf(stderr,"cdrskin: SORRY : but uid and euid differ. So this option will be rejected.\n");
Cdrpreskin_consider_normal_user(0);
}
{*exit_value= 2; goto ex;} {*exit_value= 2; goto ex;}
} }
} }

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2007.09.24.181340" #define Cdrskin_timestamP "2007.09.26.155301"