diff for duplicates of <20190815083050.GC27238@mwanda> diff --git a/a/1.txt b/N1/1.txt index d4e7522..91523b2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ We recently added a kfree() after the end of the loop: - if (retries = RETRIES) { + if (retries == RETRIES) { kfree(reply); return -EINVAL; } @@ -26,7 +26,7 @@ index 59e9d05ab928..0af048d1a815 100644 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c @@ -353,7 +353,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg, !!(HIGH_WORD(ecx) & MESSAGE_STATUS_HB)); - if ((HIGH_WORD(ebx) & MESSAGE_STATUS_SUCCESS) = 0) { + if ((HIGH_WORD(ebx) & MESSAGE_STATUS_SUCCESS) == 0) { kfree(reply); - + reply = NULL; @@ -35,7 +35,7 @@ index 59e9d05ab928..0af048d1a815 100644 continue; @@ -377,7 +377,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg, - if ((HIGH_WORD(ecx) & MESSAGE_STATUS_SUCCESS) = 0) { + if ((HIGH_WORD(ecx) & MESSAGE_STATUS_SUCCESS) == 0) { kfree(reply); - + reply = NULL; @@ -46,7 +46,7 @@ index 59e9d05ab928..0af048d1a815 100644 break; } -- if (retries = RETRIES) { +- if (retries == RETRIES) { - kfree(reply); + if (!reply) return -EINVAL; diff --git a/a/content_digest b/N1/content_digest index 244f872..95458cf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[PATCH] drm/vmwgfx: Fix double free in vmw_recv_msg()\0" - "Date\0Thu, 15 Aug 2019 08:30:50 +0000\0" + "Date\0Thu, 15 Aug 2019 11:30:50 +0300\0" "To\0VMware Graphics <linux-graphics-maintainer@vmware.com>" " Colin Ian King <colin.king@canonical.com>\0" "Cc\0Thomas Hellstrom <thellstrom@vmware.com>" @@ -13,7 +13,7 @@ "b\0" "We recently added a kfree() after the end of the loop:\n" "\n" - "\tif (retries = RETRIES) {\n" + "\tif (retries == RETRIES) {\n" "\t\tkfree(reply);\n" "\t\treturn -EINVAL;\n" "\t}\n" @@ -39,7 +39,7 @@ "+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c\n" "@@ -353,7 +353,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,\n" " \t\t\t\t !!(HIGH_WORD(ecx) & MESSAGE_STATUS_HB));\n" - " \t\tif ((HIGH_WORD(ebx) & MESSAGE_STATUS_SUCCESS) = 0) {\n" + " \t\tif ((HIGH_WORD(ebx) & MESSAGE_STATUS_SUCCESS) == 0) {\n" " \t\t\tkfree(reply);\n" "-\n" "+\t\t\treply = NULL;\n" @@ -48,7 +48,7 @@ " \t\t\t\tcontinue;\n" "@@ -377,7 +377,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,\n" " \n" - " \t\tif ((HIGH_WORD(ecx) & MESSAGE_STATUS_SUCCESS) = 0) {\n" + " \t\tif ((HIGH_WORD(ecx) & MESSAGE_STATUS_SUCCESS) == 0) {\n" " \t\t\tkfree(reply);\n" "-\n" "+\t\t\treply = NULL;\n" @@ -59,7 +59,7 @@ " \t\tbreak;\n" " \t}\n" " \n" - "-\tif (retries = RETRIES) {\n" + "-\tif (retries == RETRIES) {\n" "-\t\tkfree(reply);\n" "+\tif (!reply)\n" " \t\treturn -EINVAL;\n" @@ -70,4 +70,4 @@ "-- \n" 2.20.1 -b12717496aa57de0070a97fad22d4bd2761397aff0bdad3c17c0db2743d8a8a8 +e2e99d452b3e70adab0f42f370b1ee51cb21b66c8e0ba9bb7c7d27fc458c4a42
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.