diff for duplicates of <1492593414.3108.1.camel@spectralink.com> diff --git a/a/1.txt b/N1/1.txt index 2230a97..739405f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,25 +1,38 @@ -T24gVHVlLCAyMDE3LTA0LTE4IGF0IDIyOjE0ICswMzAwLCBEYW4gQ2FycGVudGVyIHdyb3RlOg0K -PiBUaGlzIHBhdGNoIGlzIHByb21wdGVkIGJ5IGEgc3RhdGljIGNoZWNrZXIgd2FybmluZyBhYm91 -dCBhIHBvdGVudGlhbA0KPiB1c2UgYWZ0ZXIgZnJlZS7CoMKgVGhlIGNvbmNlcm4gaXMgdGhhdCBu -ZXRpZl9yeF9uaSgpIGNhbiBmcmVlICJza2IiIGFuZA0KPiB3ZQ0KPiBjYWxsIGl0IHR3aWNlLg0K -PiANCj4gV2hlbiBJIGxvb2sgYXQgdGhlIGNvbW1pdCB0aGF0IGFkZGVkIHRoaXMsIGl0IGxvb2tz -IGxpa2Ugc29tZSBzdHJheQ0KPiBsaW5lcyB3ZXJlIGFkZGVkIGFjY2lkZW50YWxseS7CoMKgSXQg -ZG9lc24ndCBtYWtlIHNlbnNlIHRvIG1lIHRoYXQgd2UNCj4gd291bGQgcmVjaWV2ZSB0aGUgc2Ft -ZSBkYXRhIHR3byB0aW1lcy7CoMKgSSBhc2tlZCB0aGUgYXV0aG9yIGJ1dCBuZXZlcg0KPiByZWNp -ZXZlZCBhIHJlc3BvbnNlLg0KPiANCj4gSSBjYW4ndCB0ZXN0IHRoaXMgY29kZSwgYnV0IEknbSBw -cmV0dHkgc3VyZSBteSBwYXRjaCBpcyBjb3JyZWN0Lg0KDQpTb3JyeSBmb3Igbm90IGdldHRpbmcg -YmFjayBlYXJsaWVyLCBJIGhhdmUgc3dhbXBlZCB3aXRoIG90aGVyIHN0dWZmLg0KDQpZb3UgYXJl -IGNvcnJlY3QgdGhhdCB0aGVzZSBsaW5lcyB3YXMgYWRkZWQgYWNjaWRlbnRhbGx5Lg0KDQpBY2tl -ZC1ieTogU3RlZmFuIFPDuHJlbnNlbiA8c3RlZmFuLnNvcmVuc2VuQHNwZWN0cmFsaW5rLmNvbT4N -Cg0KPiANCj4gRml4ZXM6IDRiMDYzMjU4YWI5MyAoImRwODM2NDA6IERlbGF5IHNjaGVkdWxlZCB3 -b3JrLiIpDQo+IFNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3Jh -Y2xlLmNvbT4NCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC9waHkvZHA4MzY0MC5jIGIv -ZHJpdmVycy9uZXQvcGh5L2RwODM2NDAuYw0KPiBpbmRleCBlMjQ2MGE1N2U0YjEuLmVkMGQxMGY1 -NGYyNiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9uZXQvcGh5L2RwODM2NDAuYw0KPiArKysgYi9k -cml2ZXJzL25ldC9waHkvZHA4MzY0MC5jDQo+IEBAIC0xNDM4LDggKzE0MzgsNiBAQCBzdGF0aWMg -Ym9vbCBkcDgzNjQwX3J4dHN0YW1wKHN0cnVjdCBwaHlfZGV2aWNlDQo+ICpwaHlkZXYsDQo+IMKg -CQlza2JfaW5mby0+dG1vID0gamlmZmllcyArIFNLQl9USU1FU1RBTVBfVElNRU9VVDsNCj4gwqAJ -CXNrYl9xdWV1ZV90YWlsKCZkcDgzNjQwLT5yeF9xdWV1ZSwgc2tiKTsNCj4gwqAJCXNjaGVkdWxl -X2RlbGF5ZWRfd29yaygmZHA4MzY0MC0+dHNfd29yaywNCj4gU0tCX1RJTUVTVEFNUF9USU1FT1VU -KTsNCj4gLQl9IGVsc2Ugew0KPiAtCQluZXRpZl9yeF9uaShza2IpOw0KPiDCoAl9DQo+IMKgDQo+ -IMKgCXJldHVybiB0cnVlOw= +On Tue, 2017-04-18 at 22:14 +0300, Dan Carpenter wrote: +> This patch is prompted by a static checker warning about a potential +> use after free. The concern is that netif_rx_ni() can free "skb" and +> we +> call it twice. +> +> When I look at the commit that added this, it looks like some stray +> lines were added accidentally. It doesn't make sense to me that we +> would recieve the same data two times. I asked the author but never +> recieved a response. +> +> I can't test this code, but I'm pretty sure my patch is correct. + +Sorry for not getting back earlier, I have swamped with other stuff. + +You are correct that these lines was added accidentally. + +Acked-by: Stefan Sørensen <stefan.sorensen@spectralink.com> + +> +> Fixes: 4b063258ab93 ("dp83640: Delay scheduled work.") +> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +> +> diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c +> index e2460a57e4b1..ed0d10f54f26 100644 +> --- a/drivers/net/phy/dp83640.c +> +++ b/drivers/net/phy/dp83640.c +> @@ -1438,8 +1438,6 @@ static bool dp83640_rxtstamp(struct phy_device +> *phydev, +> skb_info->tmo = jiffies + SKB_TIMESTAMP_TIMEOUT; +> skb_queue_tail(&dp83640->rx_queue, skb); +> schedule_delayed_work(&dp83640->ts_work, +> SKB_TIMESTAMP_TIMEOUT); +> - } else { +> - netif_rx_ni(skb); +> } +> +> return true; diff --git a/a/content_digest b/N1/content_digest index 0f10fad..40d322b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,30 +10,43 @@ " kernel-janitors@vger.kernel.org <kernel-janitors@vger.kernel.org>\0" "\00:1\0" "b\0" - "T24gVHVlLCAyMDE3LTA0LTE4IGF0IDIyOjE0ICswMzAwLCBEYW4gQ2FycGVudGVyIHdyb3RlOg0K\n" - "PiBUaGlzIHBhdGNoIGlzIHByb21wdGVkIGJ5IGEgc3RhdGljIGNoZWNrZXIgd2FybmluZyBhYm91\n" - "dCBhIHBvdGVudGlhbA0KPiB1c2UgYWZ0ZXIgZnJlZS7CoMKgVGhlIGNvbmNlcm4gaXMgdGhhdCBu\n" - "ZXRpZl9yeF9uaSgpIGNhbiBmcmVlICJza2IiIGFuZA0KPiB3ZQ0KPiBjYWxsIGl0IHR3aWNlLg0K\n" - "PiANCj4gV2hlbiBJIGxvb2sgYXQgdGhlIGNvbW1pdCB0aGF0IGFkZGVkIHRoaXMsIGl0IGxvb2tz\n" - "IGxpa2Ugc29tZSBzdHJheQ0KPiBsaW5lcyB3ZXJlIGFkZGVkIGFjY2lkZW50YWxseS7CoMKgSXQg\n" - "ZG9lc24ndCBtYWtlIHNlbnNlIHRvIG1lIHRoYXQgd2UNCj4gd291bGQgcmVjaWV2ZSB0aGUgc2Ft\n" - "ZSBkYXRhIHR3byB0aW1lcy7CoMKgSSBhc2tlZCB0aGUgYXV0aG9yIGJ1dCBuZXZlcg0KPiByZWNp\n" - "ZXZlZCBhIHJlc3BvbnNlLg0KPiANCj4gSSBjYW4ndCB0ZXN0IHRoaXMgY29kZSwgYnV0IEknbSBw\n" - "cmV0dHkgc3VyZSBteSBwYXRjaCBpcyBjb3JyZWN0Lg0KDQpTb3JyeSBmb3Igbm90IGdldHRpbmcg\n" - "YmFjayBlYXJsaWVyLCBJIGhhdmUgc3dhbXBlZCB3aXRoIG90aGVyIHN0dWZmLg0KDQpZb3UgYXJl\n" - "IGNvcnJlY3QgdGhhdCB0aGVzZSBsaW5lcyB3YXMgYWRkZWQgYWNjaWRlbnRhbGx5Lg0KDQpBY2tl\n" - "ZC1ieTogU3RlZmFuIFPDuHJlbnNlbiA8c3RlZmFuLnNvcmVuc2VuQHNwZWN0cmFsaW5rLmNvbT4N\n" - "Cg0KPiANCj4gRml4ZXM6IDRiMDYzMjU4YWI5MyAoImRwODM2NDA6IERlbGF5IHNjaGVkdWxlZCB3\n" - "b3JrLiIpDQo+IFNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3Jh\n" - "Y2xlLmNvbT4NCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC9waHkvZHA4MzY0MC5jIGIv\n" - "ZHJpdmVycy9uZXQvcGh5L2RwODM2NDAuYw0KPiBpbmRleCBlMjQ2MGE1N2U0YjEuLmVkMGQxMGY1\n" - "NGYyNiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9uZXQvcGh5L2RwODM2NDAuYw0KPiArKysgYi9k\n" - "cml2ZXJzL25ldC9waHkvZHA4MzY0MC5jDQo+IEBAIC0xNDM4LDggKzE0MzgsNiBAQCBzdGF0aWMg\n" - "Ym9vbCBkcDgzNjQwX3J4dHN0YW1wKHN0cnVjdCBwaHlfZGV2aWNlDQo+ICpwaHlkZXYsDQo+IMKg\n" - "CQlza2JfaW5mby0+dG1vID0gamlmZmllcyArIFNLQl9USU1FU1RBTVBfVElNRU9VVDsNCj4gwqAJ\n" - "CXNrYl9xdWV1ZV90YWlsKCZkcDgzNjQwLT5yeF9xdWV1ZSwgc2tiKTsNCj4gwqAJCXNjaGVkdWxl\n" - "X2RlbGF5ZWRfd29yaygmZHA4MzY0MC0+dHNfd29yaywNCj4gU0tCX1RJTUVTVEFNUF9USU1FT1VU\n" - "KTsNCj4gLQl9IGVsc2Ugew0KPiAtCQluZXRpZl9yeF9uaShza2IpOw0KPiDCoAl9DQo+IMKgDQo+\n" - IMKgCXJldHVybiB0cnVlOw= + "On Tue, 2017-04-18 at 22:14 +0300, Dan Carpenter wrote:\n" + "> This patch is prompted by a static checker warning about a potential\n" + "> use after free.\302\240\302\240The concern is that netif_rx_ni() can free \"skb\" and\n" + "> we\n" + "> call it twice.\n" + "> \n" + "> When I look at the commit that added this, it looks like some stray\n" + "> lines were added accidentally.\302\240\302\240It doesn't make sense to me that we\n" + "> would recieve the same data two times.\302\240\302\240I asked the author but never\n" + "> recieved a response.\n" + "> \n" + "> I can't test this code, but I'm pretty sure my patch is correct.\n" + "\n" + "Sorry for not getting back earlier, I have swamped with other stuff.\n" + "\n" + "You are correct that these lines was added accidentally.\n" + "\n" + "Acked-by: Stefan S\303\270rensen <stefan.sorensen@spectralink.com>\n" + "\n" + "> \n" + "> Fixes: 4b063258ab93 (\"dp83640: Delay scheduled work.\")\n" + "> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" + "> \n" + "> diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c\n" + "> index e2460a57e4b1..ed0d10f54f26 100644\n" + "> --- a/drivers/net/phy/dp83640.c\n" + "> +++ b/drivers/net/phy/dp83640.c\n" + "> @@ -1438,8 +1438,6 @@ static bool dp83640_rxtstamp(struct phy_device\n" + "> *phydev,\n" + "> \302\240\t\tskb_info->tmo = jiffies + SKB_TIMESTAMP_TIMEOUT;\n" + "> \302\240\t\tskb_queue_tail(&dp83640->rx_queue, skb);\n" + "> \302\240\t\tschedule_delayed_work(&dp83640->ts_work,\n" + "> SKB_TIMESTAMP_TIMEOUT);\n" + "> -\t} else {\n" + "> -\t\tnetif_rx_ni(skb);\n" + "> \302\240\t}\n" + "> \302\240\n" + "> \302\240\treturn true;" -a630a5d5732463f6de75e47e48d34cceadea7556b20fcc521eda3538d6c30d8b +009b3ed3a5d347a5ed750f66a607e37cb0850e5835fe867fc9235e14fb439bec
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.