kms permission ok if running as root, no pkexec needed
This commit is contained in:
parent
8d250f7e33
commit
be388cda5f
@ -67,13 +67,13 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path, const char
|
||||
struct sockaddr_un local_addr = {0};
|
||||
struct sockaddr_un remote_addr = {0};
|
||||
|
||||
// TODO: Check if gsr-kms-server is installed
|
||||
// TODO: Check if pkexec is installed
|
||||
|
||||
char server_filepath[PATH_MAX];
|
||||
snprintf(server_filepath, sizeof(server_filepath), "%s/%s", program_dir, "gsr-kms-server");
|
||||
|
||||
int has_perm = 0;
|
||||
if(geteuid() == 0) {
|
||||
has_perm = 1;
|
||||
} else {
|
||||
cap_t kms_server_cap = cap_get_file(server_filepath);
|
||||
if(kms_server_cap) {
|
||||
cap_flag_value_t res = 0;
|
||||
@ -91,6 +91,7 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path, const char
|
||||
else
|
||||
fprintf(stderr, "failed to get cap\n");
|
||||
}
|
||||
}
|
||||
|
||||
self->card_path = strdup(card_path);
|
||||
if(!self->card_path) {
|
||||
|
@ -73,6 +73,7 @@ static int get_kms(const char *card_path, gsr_kms_response *response) {
|
||||
if (0 != drmSetClientCap(drmfd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
|
||||
response->result = KMS_RESULT_INSUFFICIENT_PERMISSIONS;
|
||||
snprintf(response->data.err_msg, sizeof(response->data.err_msg), "drmSetClientCap failed, error: %s", strerror(errno));
|
||||
close(drmfd);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -80,6 +81,7 @@ static int get_kms(const char *card_path, gsr_kms_response *response) {
|
||||
if (!planes) {
|
||||
response->result = KMS_RESULT_FAILED_TO_GET_KMS;
|
||||
snprintf(response->data.err_msg, sizeof(response->data.err_msg), "failed to access planes, error: %s", strerror(errno));
|
||||
close(drmfd);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -134,7 +136,7 @@ static int get_kms(const char *card_path, gsr_kms_response *response) {
|
||||
}
|
||||
|
||||
drmModeFreePlaneResources(planes);
|
||||
close(drmfd); // TODO?
|
||||
close(drmfd);
|
||||
|
||||
if(response->data.fd.fd == 0) {
|
||||
response->result = KMS_RESULT_NO_KMS_AVAILABLE;
|
||||
|
Loading…
Reference in New Issue
Block a user