summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2009-09-25 07:05:00 -0400
committerKarolin Seeger <kseeger@samba.org>2009-09-28 20:34:53 +0200
commit87fe29ca3239492126a99e1562db673ea7ca208b (patch)
tree370caeb70b9b41bbf70e6c4e189140511a09cdbd
parent493ee2c888c4eb54dfa4063ac9fb3f19323a7b4c (diff)
downloadsamba-87fe29ca3239492126a99e1562db673ea7ca208b.tar.gz
mount.cifs: check access of credential files before opening
It's possible for an unprivileged user to pass a setuid mount.cifs a credential or password file to which he does not have access. This can cause mount.cifs to open the file on his behalf and possibly leak the info in the first few lines of the file. Check the access permissions of the file before opening it. Reported-by: Ronald Volgers <r.c.volgers@student.utwente.nl> Signed-off-by: Jeff Layton <jlayton@redhat.com> Acked-by: Steve French <sfrench@us.ibm.com> Part 1/2 of a fix for CVE-2009-2948.
-rw-r--r--source/client/mount.cifs.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index d05115b892d..cee9188f9f9 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -199,6 +199,11 @@ static int open_cred_file(char * file_name)
char * temp_val;
FILE * fs;
int i, length;
+
+ i = access(file_name, R_OK);
+ if (i)
+ return i;
+
fs = fopen(file_name,"r");
if(fs == NULL)
return errno;
@@ -321,6 +326,12 @@ static int get_password_from_file(int file_descript, char * filename)
}
if(filename != NULL) {
+ rc = access(filename, R_OK);
+ if (rc) {
+ fprintf(stderr, "mount.cifs failed: access check of %s failed: %s\n",
+ filename, strerror(errno));
+ exit(EX_SYSERR);
+ }
file_descript = open(filename, O_RDONLY);
if(file_descript < 0) {
printf("mount.cifs failed. %s attempting to open password file %s\n",