Attachment 28150 Details for Bug 65317

[patch] abuse-patch2.diff

abuse-patch2.diff (text/plain), 4.79 KB, created by Thomas Biege on 2005-02-03 01:45:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2005-02-03 01:45:46 UTC

Size: 4.79 KB

patch

obsolete

>diff -Ebru abuse_sdl-0.7.0_9.0/src/cache.cpp abuse_sdl-0.7.0/src/cache.cpp
>--- abuse_sdl-0.7.0_9.0/src/cache.cpp	2002-12-15 06:00:32.000000000 +0100
>+++ abuse_sdl-0.7.0/src/cache.cpp	2005-02-02 18:40:52.000000000 +0100
>@@ -668,9 +668,20 @@
> 	char *prefix="c:\\";
> #else
> 	char *prefix="/tmp/";     // for UNIX store lisp cache in tmp dir
>-	int flags=O_CREAT | O_RDWR;
>+	int flags=O_CREAT | O_EXCL | O_RDWR;
> #endif
> 
>+	// drop privileges prior to creating file.
>+	uid_t euid;
>+	gid_t egid;
>+	euid = geteuid();
>+	egid = getegid();
>+
>+	if(setgid(getgid()) != 0 || setuid(getuid()) != 0) {
>+		printf("Error : can not drop privileges");
>+		return;
>+	}
>+
> 	int cfail = 1, num = 0;
> 	do
> 	{
>@@ -697,6 +708,9 @@
> 
> 	} while (cfail && num<15);
> 
>+	setuid(euid);
>+	setgid(egid);
>+
> 	if (cfail)
> 	{
> 		fprintf(stderr,"Error : Unable to open cache file for compiled code.\n"
>diff -Ebru abuse_sdl-0.7.0_9.0/src/dev.cpp abuse_sdl-0.7.0/src/dev.cpp
>--- abuse_sdl-0.7.0_9.0/src/dev.cpp	2002-12-15 06:00:32.000000000 +0100
>+++ abuse_sdl-0.7.0/src/dev.cpp	2005-02-02 18:13:53.000000000 +0100
>@@ -874,7 +874,8 @@
>     else if (!strcmp(argv[i],"-f"))
>     {
>       i++;
>-      strcpy(level_file,argv[i]);
>+      strncpy(level_file,argv[i],sizeof(level_file)-1);
>+      level_file[sizeof(level_file)-1] = '\0';
>     } else if (!strcmp(argv[i],"-2"))
>       start_doubled=1;
>     else if (!strcmp(argv[i],"-demo"))
>diff -Ebru abuse_sdl-0.7.0_9.0/src/imlib/specs.cpp abuse_sdl-0.7.0/src/imlib/specs.cpp
>--- abuse_sdl-0.7.0_9.0/src/imlib/specs.cpp	2002-12-15 06:00:32.000000000 +0100
>+++ abuse_sdl-0.7.0/src/imlib/specs.cpp	2005-02-02 18:41:20.000000000 +0100
>@@ -280,12 +280,26 @@
> 
> void fast_load_start_recording(char *filename)
> {
>+  // drop privileges prior to creating file.
>+  uid_t euid;
>+  gid_t egid;
>+  euid = geteuid();
>+  egid = getegid();
>+
>+  if(setgid(getgid()) != 0 || setuid(getuid()) != 0) {
>+	dprintf("Specs : can not drop privileges");
>+	return;
>+  }
>+
> #if (defined(__APPLE__) && !defined(__MACH__))
>   fast_load_fd = ::open(macify_name(filename),O_BINARY|O_CREAT|O_RDWR);
> #else
>   fast_load_fd = ::open(filename,O_CREAT|O_RDWR,S_IRWXU | S_IRWXG | S_IRWXO);
> #endif
> 	fast_load_mode = 1;
>+
>+  setuid(euid);
>+  setgid(egid);
> }
> 
> void fast_load_stop_recording()
>diff -Ebru abuse_sdl-0.7.0_9.0/src/innet.cpp abuse_sdl-0.7.0/src/innet.cpp
>--- abuse_sdl-0.7.0_9.0/src/innet.cpp	2002-12-15 06:00:32.000000000 +0100
>+++ abuse_sdl-0.7.0/src/innet.cpp	2005-02-02 18:17:05.000000000 +0100
>@@ -83,7 +83,8 @@
> 		else if( !strcmp( argv[i], "-net" ) && i < argc-1 )
> 		{
> 			i++;
>-			strcpy( main_net_cfg->server_name, argv[i] );
>+			strncpy(main_net_cfg->server_name,argv[i],sizeof(main_net_cfg->server_name)-1);
>+			main_net_cfg->server_name[sizeof(main_net_cfg->server_name)-1]='\0';
> 			main_net_cfg->state = net_configuration::CLIENT;
> 		}
> 		else if (!strcmp(argv[i],"-ndb"))
>diff -Ebru abuse_sdl-0.7.0_9.0/src/loader2.cpp abuse_sdl-0.7.0/src/loader2.cpp
>--- abuse_sdl-0.7.0_9.0/src/loader2.cpp	2002-12-15 06:00:32.000000000 +0100
>+++ abuse_sdl-0.7.0/src/loader2.cpp	2005-02-02 18:17:31.000000000 +0100
>@@ -83,7 +83,7 @@
>   if (fp->open_failure()) 
>   { 
>     delete fp;
>-    sprintf(fn,"art/%s",filename);  
>+    snprintf(fn,sizeof(fn),"art/%s",filename);  
>     fp=open_file(fn,"rb");
>     if (fp->open_failure()) 
>     { 
>@@ -305,12 +305,13 @@
>       if (!strcmp(argv[i],"-lsf"))
>       {
> 	i++;
>-	strcpy(lsf,argv[i]);
>+	strncpy(lsf,argv[i],sizeof(lsf)-1);
>+	lsf[sizeof(lsf)-1]='\0';
>       }
>       if (!strcmp(argv[i],"-a"))
>       {
> 	i++;
>-	sprintf(lsf,"addon/%s/%s.lsp",argv[i],argv[i]);      
>+	snprintf(lsf,sizeof(lsf),"addon/%s/%s.lsp",argv[i],argv[i]);      
>       }
>     }
>   } else if (!get_remote_lsf(net_server,lsf))
>diff -Ebru abuse_sdl-0.7.0_9.0/src/net/engine.cpp abuse_sdl-0.7.0/src/net/engine.cpp
>--- abuse_sdl-0.7.0_9.0/src/net/engine.cpp	2002-12-15 06:00:32.000000000 +0100
>+++ abuse_sdl-0.7.0/src/net/engine.cpp	2005-02-02 18:20:18.000000000 +0100
>@@ -269,7 +269,9 @@
>     else if (!strcmp(argv[i],"-game_port"))
>       game_port=atoi(argv[i+1]);
>     else if (!strcmp(argv[i],"-net"))
>-    { strcpy(net_server,argv[i+1]); }
>+    { strncpy(net_server,argv[i+1],sizeof(net_server)); 
>+      net_server[sizeof(net_server)-1]='\0';
>+    }
> 
>   if (game_port==-1) game_port=DEFAULT_GAME_PORT+1;
> 
>diff -Ebru abuse_sdl-0.7.0_9.0/src/old_server.cpp abuse_sdl-0.7.0/src/old_server.cpp
>--- abuse_sdl-0.7.0_9.0/src/old_server.cpp	2002-12-15 06:00:32.000000000 +0100
>+++ abuse_sdl-0.7.0/src/old_server.cpp	2005-02-02 18:25:28.000000000 +0100
>@@ -81,7 +81,8 @@
>     } else if (!strcmp(argv[i],"-name"))     // name player uses when connecting
>     {
>       i++;
>-      strcpy(name,argv[i]);
>+      strncpy(name,argv[i],sizeof(name)-1);
>+      name[sizeof(name)-1]='\0';
>     }  else if (!strcmp(argv[i],"-nonet"))
>     {
>       dprintf("Network bypassed, no player will be able to connect\n");

Actions: View | Diff

Attachments on bug 65317: 28150