X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=016329841fe87255cdc68c1191e8661124c1c326;hp=46af53f8b81e78d41d25a12200c5888f6171198f;hb=5ff39998bf0ce71bd8fc8d0f002ceb81b711992f;hpb=030a9d5c9fe28328d5db977bf2c8ddbf7302673d

diff --git a/afs.c b/afs.c
index 46af53f8..01632984 100644
--- a/afs.c
+++ b/afs.c
@@ -97,10 +97,11 @@ static char *current_mop; /* mode or playlist specifier. NULL means dummy mood *
 /**
  * A random number used to "authenticate" the connection.
  *
- * para_server picks this number by random before forking the afs process.  The
- * command handlers write this number together with the id of the shared memory
- * area containing the query. This way, a malicious local user has to know this
- * number to be able to cause the afs process to crash by sending fake queries.
+ * para_server picks this number by random before it forks the afs process. The
+ * command handlers know this number as well and write it to the afs socket,
+ * together with the id of the shared memory area which contains the payload of
+ * the afs command. A local process has to know this number to abuse the afs
+ * service provided by the local socket.
  */
 extern uint32_t afs_socket_cookie;
 
@@ -423,7 +424,7 @@ static int pass_afd(int fd, char *buf, size_t size)
 {
 	struct msghdr msg = {.msg_iov = NULL};
 	struct cmsghdr *cmsg;
-	char control[255];
+	char control[255] __a_aligned(8);
 	int ret;
 	struct iovec iov;
 
@@ -496,12 +497,11 @@ no_admissible_files:
 }
 
 /* Never fails if arg == NULL */
-static int activate_mood_or_playlist(char *arg, int *num_admissible)
+static int activate_mood_or_playlist(const char *arg, int *num_admissible)
 {
 	enum play_mode mode;
 	int ret;
 
-	PARA_INFO_LOG("new playlist: %s\n", arg);
 	if (!arg) {
 		ret = change_current_mood(NULL); /* always successful */
 		mode = PLAY_MODE_MOOD;
@@ -590,7 +590,7 @@ static void flush_and_free_pb(struct para_buffer *pb)
 
 static int com_select_callback(struct afs_callback_arg *aca)
 {
-	char *arg = aca->query.data;
+	const char *arg = aca->query.data;
 	int num_admissible, ret;
 
 	ret = clear_score_table();
@@ -649,7 +649,7 @@ static int setup_command_socket_or_die(void)
 	ret = create_local_socket(socket_name, 0);
 	if (ret < 0) {
 		ret = create_local_socket(socket_name,
-			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IROTH);
 		if (ret < 0) {
 			PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret),
 				socket_name);