From 971d6ce16f7ee87c1fdaf8a8cdeee286b4567aa1 Mon Sep 17 00:00:00 2001
From: Luke Wilde <lukew@serenityos.org>
Date: Sat, 4 Jun 2022 00:19:15 +0100
Subject: [PATCH] LibGL: Reject GL_LEFT and GL_RIGHT in glCullFace

glCullFace only accepts GL_FRONT, GL_BACK and GL_FRONT_AND_BACK.
We checked if the mode was valid by performing
```
cull_mode < GL_FRONT || cull_mode > GL_FRONT_AND_BACK
```

However, this range also contains GL_LEFT and GL_RIGHT, which we would
accept when we should return a GL_INVALID_ENUM error.
---
 Tests/LibGL/TestAPI.cpp                | 13 +++++++++++++
 Userland/Libraries/LibGL/GLContext.cpp |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Tests/LibGL/TestAPI.cpp b/Tests/LibGL/TestAPI.cpp
index c33ecf108f..7f717db686 100644
--- a/Tests/LibGL/TestAPI.cpp
+++ b/Tests/LibGL/TestAPI.cpp
@@ -40,3 +40,16 @@ TEST_CASE(0001_gl_gen_textures_does_not_return_the_same_texture_name_twice_unles
 
     EXPECT_NE(texture1, texture2);
 }
+
+TEST_CASE(0002_gl_cull_face_does_not_accept_left_and_right)
+{
+    auto context = create_testing_context();
+
+    // glCullFace only accepts GL_FRONT, GL_BACK and GL_FRONT_AND_BACK. We checked if the mode was valid by performing cull_mode < GL_FRONT || cull_mode > GL_FRONT_AND_BACK.
+    // However, this range also contains GL_LEFT and GL_RIGHT, which we would accept when we should return a GL_INVALID_ENUM error.
+    glCullFace(GL_LEFT);
+    EXPECT_EQ(glGetError(), static_cast<GLenum>(GL_INVALID_ENUM));
+
+    glCullFace(GL_RIGHT);
+    EXPECT_EQ(glGetError(), static_cast<GLenum>(GL_INVALID_ENUM));
+}
diff --git a/Userland/Libraries/LibGL/GLContext.cpp b/Userland/Libraries/LibGL/GLContext.cpp
index 76c6c48fd4..8fa80a2ecf 100644
--- a/Userland/Libraries/LibGL/GLContext.cpp
+++ b/Userland/Libraries/LibGL/GLContext.cpp
@@ -243,7 +243,7 @@ void GLContext::gl_cull_face(GLenum cull_mode)
 {
     APPEND_TO_CALL_LIST_AND_RETURN_IF_NEEDED(gl_cull_face, cull_mode);
 
-    RETURN_WITH_ERROR_IF(cull_mode < GL_FRONT || cull_mode > GL_FRONT_AND_BACK, GL_INVALID_ENUM);
+    RETURN_WITH_ERROR_IF(cull_mode != GL_FRONT && cull_mode != GL_BACK && cull_mode != GL_FRONT_AND_BACK, GL_INVALID_ENUM);
 
     m_culled_sides = cull_mode;