diff for duplicates of <20200722204231.GA3398@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 7336bbf..a7a6058 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,16 +28,16 @@ On Wed, Jul 22, 2020 at 05:38:58PM -0300, Marcelo Ricardo Leitner wrote: > struct sctp_association *asoc; > + struct sctp_sack_info _params; > -> if (optlen = sizeof(struct sctp_sack_info)) { -> if (params->sack_delay = 0 && params->sack_freq = 0) +> if (optlen == sizeof(struct sctp_sack_info)) { +> if (params->sack_delay == 0 && params->sack_freq == 0) > @@ -2767,7 +2768,9 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, > "Use struct sctp_sack_info instead\n", > current->comm, task_pid_nr(current)); > -> - if (params->sack_delay = 0) +> - if (params->sack_delay == 0) > + memcpy(&_params, params, sizeof(struct sctp_assoc_value)); > + params = &_params; -> + if (((struct sctp_assoc_value *)params)->assoc_value = 0) +> + if (((struct sctp_assoc_value *)params)->assoc_value == 0) > params->sack_freq = 1; > else > params->sack_freq = 0; diff --git a/a/content_digest b/N1/content_digest index f34ad31..834afe3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\05955bc857c93d4bb64731ef7a9e90cb0094a8989.1595450200.git.marcelo.leitner@gmail.com\0" "From\0Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>\0" "Subject\0Re: [PATCH net-next] sctp: fix slab-out-of-bounds in SCTP_DELAYED_SACK processing\0" - "Date\0Wed, 22 Jul 2020 20:42:31 +0000\0" + "Date\0Wed, 22 Jul 2020 17:42:31 -0300\0" "To\0netdev@vger.kernel.org\0" "Cc\0Neil Horman <nhorman@tuxdriver.com>" Christoph Hellwig <hch@lst.de> @@ -38,16 +38,16 @@ "> \tstruct sctp_association *asoc;\n" "> +\tstruct sctp_sack_info _params;\n" "> \n" - "> \tif (optlen = sizeof(struct sctp_sack_info)) {\n" - "> \t\tif (params->sack_delay = 0 && params->sack_freq = 0)\n" + "> \tif (optlen == sizeof(struct sctp_sack_info)) {\n" + "> \t\tif (params->sack_delay == 0 && params->sack_freq == 0)\n" "> @@ -2767,7 +2768,9 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk,\n" "> \t\t\t\t \"Use struct sctp_sack_info instead\\n\",\n" "> \t\t\t\t current->comm, task_pid_nr(current));\n" "> \n" - "> -\t\tif (params->sack_delay = 0)\n" + "> -\t\tif (params->sack_delay == 0)\n" "> +\t\tmemcpy(&_params, params, sizeof(struct sctp_assoc_value));\n" "> +\t\tparams = &_params;\n" - "> +\t\tif (((struct sctp_assoc_value *)params)->assoc_value = 0)\n" + "> +\t\tif (((struct sctp_assoc_value *)params)->assoc_value == 0)\n" "> \t\t\tparams->sack_freq = 1;\n" "> \t\telse\n" "> \t\t\tparams->sack_freq = 0;\n" @@ -55,4 +55,4 @@ "> 2.25.4\n" > -12043798a3a70535f7224394956961c1c9cd88756c550ee8edabaed05068f2ff +4cde607e2897426c18d5d6eccfc13f1f7b04cb806e3ccac993d411ed00290f76
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.