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

Accepting request 544012 from home:BinLiu:branches:network:ha-clustering:Factory

Browse Source 
Modified: 0005-do-not-convert-empty-uid-gid-to-0.patch, 
            check whether the uid, gid is empty before calling strtol

OBS-URL: https://build.opensuse.org/request/show/544012
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=122
This commit is contained in:
Bin Liu 2017-11-21 03:17:50 +00:00 committed by Git OBS Bridge
parent 47b73d77da
commit 6151d7bebd
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>
Date: Mon, 6 Nov 2017 16:59:30 +0800
Subject: [PATCH] do not convert empty uid, gid to 0
Date: Tue, 21 Nov 2017 11:03:10 +0800
Subject: [PATCH] do not convert empty uid gid to 0
---
exec/coroparse.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
exec/coroparse.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/exec/coroparse.c b/exec/coroparse.c
index 374ed7dd..f27ead1a 100644
index 374ed7dd..ac654a11 100644
--- a/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;
+ 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);
- if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
+ if (*req_user != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) {
if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
return (id);
}
@@ -194,7 +194,7 @@ static int gid_determine (const char *req_group)
@@ -193,6 +199,12 @@ static int gid_determine (const char *req_group)
long int id;
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);
- if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
+ if (*req_group != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) {
if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
return (id);
}
--
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)
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