From 621aad95f2f6189269f8aa3fc852b696e1ab7cd2 Mon Sep 17 00:00:00 2001
From: Dan Goldsmith <aa9863@coventry.ac.uk>
Date: Tue, 24 Jan 2023 12:51:23 +0000
Subject: [PATCH] Randomize buffer sizes

---
 BaseImages/Server/server.c                  | 4 ++--
 Week2_Lab2/32Bit_NoALSR/docker-compose.yaml | 8 +++++---
 Week2_Lab2/32Bit_NoALSR/ret2winOne.c        | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/BaseImages/Server/server.c b/BaseImages/Server/server.c
index 45b10e0..fee15ce 100644
--- a/BaseImages/Server/server.c
+++ b/BaseImages/Server/server.c
@@ -23,10 +23,10 @@ int processConnection(int fd, int argc, char* argv[]) {
 
     if(getenv("RUN_ALSR")) {
       printf("Running with ALSR turned off\n");
+      int out = personality(ADDR_NO_RANDOMIZE);
       fflush(stdout);
-      personality(ADDR_NO_RANDOMIZE);
     }
-
+    
     execvp(argv[1], &argv[1]);
 }
 
diff --git a/Week2_Lab2/32Bit_NoALSR/docker-compose.yaml b/Week2_Lab2/32Bit_NoALSR/docker-compose.yaml
index 104bd88..7e9f8c0 100644
--- a/Week2_Lab2/32Bit_NoALSR/docker-compose.yaml
+++ b/Week2_Lab2/32Bit_NoALSR/docker-compose.yaml
@@ -7,8 +7,10 @@ services:
     ports:
       - "1337:1337"
       - "22:22"
-    #cap_add:
-    #  - CAP_SYS_ADMIN
+    cap_add:
+      - CAP_SYS_ADMIN
     privileged: true
     environment:
-      - RUN_ALSR
+      - RUN_ALSR=1
+
+      
diff --git a/Week2_Lab2/32Bit_NoALSR/ret2winOne.c b/Week2_Lab2/32Bit_NoALSR/ret2winOne.c
index 4415b56..1ace0b1 100644
--- a/Week2_Lab2/32Bit_NoALSR/ret2winOne.c
+++ b/Week2_Lab2/32Bit_NoALSR/ret2winOne.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 int INPUT=300; //Give enough to overflow
-int BUFFER=150;
+int BUFFER=175;
 
 void win(void){
     /*Win Condition