pool/corosync
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 544014 from network:ha-clustering:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/544014
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/corosync?expand=0&rev=48
This commit is contained in:
Dominique Leuenberger 2017-11-23 08:34:05 +00:00 committed by Git OBS Bridge
commit 6cea5cc410
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0005-do-not-convert-empty-uid-gid-to-0.patch
View File

@ -1,34 +1,42 @@
From 34e3accfcbf1d5dd08468f0e7a8aa6ceb0a7828e Mon Sep 17 00:00:00 2001 From a7a13690db8fc7508177138265c6930fa11ade3e Mon Sep 17 00:00:00 2001
From: Bin Liu <bliu@suse.com> From: Bin Liu <bliu@suse.com>
Date: Mon, 6 Nov 2017 16:59:30 +0800 Date: Tue, 21 Nov 2017 11:03:10 +0800
Subject: [PATCH] do not convert empty uid, gid to 0 Subject: [PATCH] do not convert empty uid gid to 0
--- ---
exec/coroparse.c | 4 ++-- exec/coroparse.c | 12 ++++++++++++
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 12 insertions(+)
diff --git a/exec/coroparse.c b/exec/coroparse.c diff --git a/exec/coroparse.c b/exec/coroparse.c
index 374ed7dd..f27ead1a 100644 index 374ed7dd..ac654a11 100644
--- a/exec/coroparse.c --- a/exec/coroparse.c
+++ b/exec/coroparse.c +++ b/exec/coroparse.c
@@ -140,7 +140,7 @@ static int uid_determine (const char *req_user) @@ -139,6 +139,12 @@ static int uid_determine (const char *req_user)
long int id;
char *ep; char *ep;
+ if(*req_user == '\0') {
+ sprintf (error_string_response,
+ "The user can not be empty, please read the documentation.");
+ return (-1);
+ }
+
id = strtol(req_user, &ep, 10); id = strtol(req_user, &ep, 10);
- if (*ep == '\0' && id >= 0 && id <= UINT_MAX) { if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
+ if (*req_user != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) {
return (id); return (id);
} @@ -193,6 +199,12 @@ static int gid_determine (const char *req_group)
long int id;
@@ -194,7 +194,7 @@ static int gid_determine (const char *req_group)
char *ep; char *ep;
+ if(*req_group == '\0') {
+ sprintf (error_string_response,
+ "The group can not be empty, please read the documentation.");
+ return (-1);
+ }
+
id = strtol(req_group, &ep, 10); id = strtol(req_group, &ep, 10);
- if (*ep == '\0' && id >= 0 && id <= UINT_MAX) { if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
+ if (*req_group != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) {
return (id); return (id);
}
-- --
2.13.6 2.13.6

2
corosync.changes
View File

@ -16,6 +16,8 @@ Mon Nov 6 09:14:55 UTC 2017 - bliu@suse.com
- coroparse: uidgid with empty uid or gid results into add uid 0(bsc#1066585) - coroparse: uidgid with empty uid or gid results into add uid 0(bsc#1066585)
Added: 0005-do-not-convert-empty-uid-gid-to-0.patch Added: 0005-do-not-convert-empty-uid-gid-to-0.patch
Modified: 0005-do-not-convert-empty-uid-gid-to-0.patch,
check whether the uid, gid is empty before calling strtol
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 23 03:12:42 UTC 2017 - bliu@suse.com Mon Oct 23 03:12:42 UTC 2017 - bliu@suse.com