Skip to contentSkip to conversation

net: atlantic: fix missing | operator when assigning rec->llc

PATCH Applied Colin King 3 participants 3 messages Apr 1, 2020 – Apr 2, 2020

Subsystems (4)
lore
Share & tools
lore

Colin King

author
#0 lore raw

PATCH 1/1 net: atlantic: fix missing | operator when assigning rec->llc

From: Colin Ian King <[email protected]>

rec->llc is currently being assigned twice, once with the lower 8 bits from packed_record[8] and then re-assigned afterwards with data from packed_record[9]. This looks like a type, I believe the second assignment should be using the |= operator rather than a direct assignment.

Addresses-Coverity: ("Unused value")

Fixes b8f8a0b7b5cb ("net: atlantic: MACSec ingress offload HW bindings")
---
 drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c +1 -1
index 97901c114bfa..fbe9d88b13c7 100644
@@ -491,7 +491,7 @@ get_ingress_preclass_record(struct aq_hw_s *hw,
 	rec->snap[1] = packed_record[8] & 0xFF;
 
 	rec->llc = (packed_record[8] >> 8) & 0xFF;
-	rec->llc = packed_record[9] << 8;
+	rec->llc |= packed_record[9] << 8;
 
 	rec->mac_sa[0] = packed_record[10];
 	rec->mac_sa[0] |= packed_record[11] << 16;
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw

VGhhbmtzIENvbGluLA0KDQpXZSBhbHNvIGZvdW5kIHRoaXMgdHlwbyByZWNlbnRseSwgYnV0IHlv dSB3ZXJlIGFoZWFkIG9mIHVzICkNCg0KPiBGcm9tOiBDb2xpbiBJYW4gS2luZyA8Y29saW4ua2lu Z0BjYW5vbmljYWwuY29tPg0KPiByZWMtPmxsYyBpcyBjdXJyZW50bHkgYmVpbmcgYXNzaWduZWQg dHdpY2UsIG9uY2Ugd2l0aCB0aGUgbG93ZXIgOCBiaXRzDQo+IGZyb20gcGFja2VkX3JlY29yZFs4 XSBhbmQgdGhlbiByZS1hc3NpZ25lZCBhZnRlcndhcmRzIHdpdGggZGF0YSBmcm9tIHBhY2tlZF9y ZWNvcmRbOV0uICBUaGlzIGxvb2tzIGxpa2UgYSB0eXBlLA0KPiAgSSBiZWxpZXZlIHRoZSBzZWNv bmQgYXNzaWdubWVudCBzaG91bGQgYmUgdXNpbmcgdGhlIHw9IG9wZXJhdG9yIHJhdGhlciB0aGFu IGEgZGlyZWN0IGFzc2lnbm1lbnQuDQoNCj4gQWRkcmVzc2VzLUNvdmVyaXR5OiAoIlVudXNlZCB2 YWx1ZSIpDQo+IEZpeGVzOiBiOGY4YTBiN2I1Y2IgKCJuZXQ6IGF0bGFudGljOiBNQUNTZWMgaW5n cmVzcyBvZmZsb2FkIEhXIGJpbmRpbmdzIikNCj4gU2lnbmVkLW9mZi1ieTogQ29saW4gSWFuIEtp bmcgPGNvbGluLmtpbmdAY2Fub25pY2FsLmNvbT4NCg0KQWNrZWQtYnk6IElnb3IgUnVzc2tpa2gg PGlydXNza2lraEBtYXJlbGwuY29tPg0K

maintainer Applied
#2 lore raw
In reply to Colin King

From: Colin King <[email protected]>
Date: Thu, 2 Apr 2020 00:27:36 +0100

Quoted 10 lines

From: Colin Ian King <[email protected]>

rec->llc is currently being assigned twice, once with the lower 8 bits from packed_record[8] and then re-assigned afterwards with data from packed_record[9]. This looks like a type, I believe the second assignment should be using the |= operator rather than a direct assignment.

Addresses-Coverity: ("Unused value")

Fixes b8f8a0b7b5cb ("net: atlantic: MACSec ingress offload HW bindings")

Applied, thanks.