makedumpfile/eppic: Do not scrub buffer length if length is zero
Subsystems (2)
PATCH 1/1 makedumpfile/eppic: Do not scrub buffer length if length is zero
The patch takes care of scrubbing buffer length only when it is non-zero.
Signed-off-by Aruna Balakrishnaiah <[email protected]>
--- eppic_scripts/ap_messages.c | 12 ++++++++---- eppic_scripts/tcp_sk_buf.c | 12 ++++++++---- eppic_scripts/udp_sk_buf.c | 12 ++++++++---- eppic_scripts/unix_sk_buff.c | 12 ++++++++---- eppic_scripts/vhost_net_buffers.c | 12 ++++++++---- eppic_scripts/vhost_scsi_buffers.c | 10 +++++++--- 6 files changed, 47 insertions(+), 23 deletions(-)
eppic_scripts/ap_messages.c +8 -4
@@ -51,8 +51,10 @@ ap_device()struct ap_message *apmsg; apmsg = (struct ap_message *)next1; -memset ((char *)apmsg->message,'L' , apmsg->length); -memset ((char *)&(apmsg->length),'L' ,0x8 ); +if (apmsg->length) { +memset ((char *)apmsg->message,'L' , apmsg->length); +memset ((char *)&(apmsg->length),'L' ,0x8 ); + } next1 = (struct list_head *)apmsg->list.next; }
@@ -65,8 +67,10 @@ ap_device()struct ap_message *apmsg; apmsg = (struct ap_message *)next1; -memset ((char *)apmsg->message,'L' , apmsg->length); -memset ((char *)&(apmsg->length),'L' ,0x8 ); +if (apmsg->length) { +memset ((char *)apmsg->message,'L' , apmsg->length); +memset ((char *)&(apmsg->length),'L' ,0x8 ); + } next1 = (struct list_head *)apmsg->list.next; }
eppic_scripts/tcp_sk_buf.c +8 -4
@@ -51,8 +51,10 @@ tcp() {struct sk_buff *buff = (struct sk_buff *) next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }
@@ -64,8 +66,10 @@ tcp() {struct sk_buff *buff = (struct sk_buff *) next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }
eppic_scripts/udp_sk_buf.c +8 -4
@@ -52,8 +52,10 @@ udp() {struct sk_buff *buff = (struct sk_buff *)next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }
@@ -65,8 +67,10 @@ udp() {struct sk_buff *buff = (struct sk_buff *)next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }
eppic_scripts/unix_sk_buff.c +8 -4
@@ -54,8 +54,10 @@ sunix() {struct sk_buff *buff = (struct sk_buff *)next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }
@@ -67,8 +69,10 @@ sunix() {struct sk_buff *buff = (struct sk_buff *)next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }
eppic_scripts/vhost_net_buffers.c +8 -4
@@ -40,8 +40,10 @@ vhost_net(struct vhost_net *net) {struct sk_buff *buff = (struct sk_buff *) next; -memset ((unsigned char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }
@@ -53,8 +55,10 @@ vhost_net(struct vhost_net *net) {struct sk_buff *buff = (struct sk_buff *) next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next;
eppic_scripts/vhost_scsi_buffers.c +7 -3
@@ -31,9 +31,13 @@ vhost_scsi(struct vhost_scsi *vs)for (i =0 ; i <128 ; i++) {struct vhost_virtqueue *vq = (struct vhost_virtqueue *)vs->vqs[i].vq; -for (j =0 ; j <1024 ; j++) -memset ((char *)vq->iov[j].iov_base,'L' , vq->iov[j].iov_len); -memset ((char *)&(vq->iov[j].iov_len),'L' ,0x8 ); +for (j =0 ; j <1024 ; j++) { + +if (vq->iov[j].iov_len) { +memset ((char *)vq->iov[j].iov_base,'L' , vq->iov[j].iov_len); +memset ((char *)&(vq->iov[j].iov_len),'L' ,0x8 ); + } + } } }
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 4 lines
The patch takes care of scrubbing buffer length only when it is non-zero.
Signed-off-by Aruna Balakrishnaiah <[email protected]>
Looks good to me, I'll merge this into v1.5.6.
Thanks
Atsushi Kumagai
Quoted 170 lines
---
eppic_scripts/ap_messages.c | 12 ++++++++---- eppic_scripts/tcp_sk_buf.c | 12 ++++++++---- eppic_scripts/udp_sk_buf.c | 12 ++++++++---- eppic_scripts/unix_sk_buff.c | 12 ++++++++---- eppic_scripts/vhost_net_buffers.c | 12 ++++++++---- eppic_scripts/vhost_scsi_buffers.c | 10 +++++++--- 6 files changed, 47 insertions(+), 23 deletions(-)eppic_scripts/ap_messages.c +8
-4@@ -51,8 +51,10 @@ ap_device()struct ap_message *apmsg; apmsg = (struct ap_message *)next1; -memset ((char *)apmsg->message,'L' , apmsg->length); -memset ((char *)&(apmsg->length),'L' ,0x8 ); +if (apmsg->length) { +memset ((char *)apmsg->message,'L' , apmsg->length); +memset ((char *)&(apmsg->length),'L' ,0x8 ); + } next1 = (struct list_head *)apmsg->list.next; }@@ -65,8 +67,10 @@ ap_device()struct ap_message *apmsg; apmsg = (struct ap_message *)next1; -memset ((char *)apmsg->message,'L' , apmsg->length); -memset ((char *)&(apmsg->length),'L' ,0x8 ); +if (apmsg->length) { +memset ((char *)apmsg->message,'L' , apmsg->length); +memset ((char *)&(apmsg->length),'L' ,0x8 ); + } next1 = (struct list_head *)apmsg->list.next; }eppic_scripts/tcp_sk_buf.c +8
-4@@ -51,8 +51,10 @@ tcp() {struct sk_buff *buff = (struct sk_buff *) next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }@@ -64,8 +66,10 @@ tcp() {struct sk_buff *buff = (struct sk_buff *) next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }eppic_scripts/udp_sk_buf.c +8
-4@@ -52,8 +52,10 @@ udp() {struct sk_buff *buff = (struct sk_buff *)next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }@@ -65,8 +67,10 @@ udp() {struct sk_buff *buff = (struct sk_buff *)next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }eppic_scripts/unix_sk_buff.c +8
-4@@ -54,8 +54,10 @@ sunix() {struct sk_buff *buff = (struct sk_buff *)next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }@@ -67,8 +69,10 @@ sunix() {struct sk_buff *buff = (struct sk_buff *)next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }eppic_scripts/vhost_net_buffers.c +8
-4@@ -40,8 +40,10 @@ vhost_net(struct vhost_net *net) {struct sk_buff *buff = (struct sk_buff *) next; -memset ((unsigned char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next; }@@ -53,8 +55,10 @@ vhost_net(struct vhost_net *net) {struct sk_buff *buff = (struct sk_buff *) next; -memset ((char *)buff->data,'L' , buff->data_len); -memset ((char *)&(buff->data_len),'L' ,0x4 ); +if (buff->data_len) { +memset ((char *)buff->data,'L' , buff->data_len); +memset ((char *)&(buff->data_len),'L' ,0x4 ); + } next = buff->next;eppic_scripts/vhost_scsi_buffers.c +0
-3@@ -31,9 +31,13 @@ vhost_scsi(struct vhost_scsi *vs)for (i =0 ; i <128 ; i++) {struct vhost_virtqueue *vq = (struct vhost_virtqueue *)vs->vqs[i].vq; -for (j =0 ; j <1024 ; j++) -memset ((char *)vq->iov[j].iov_base,'L' , vq->iov[j].iov_len); -memset ((char *)&(vq->iov[j].iov_len),'L' ,0x8 );
eppic_scripts/vhost_scsi_buffers.c vhost_scsi(struct vhost_scsi *vs) · line 43
Quoted 10 lines
eppic_scripts/vhost_scsi_buffers.c +7
-0+for (j =0 ; j <1024 ; j++) { + +if (vq->iov[j].iov_len) { +memset ((char *)vq->iov[j].iov_base,'L' , vq->iov[j].iov_len); +memset ((char *)&(vq->iov[j].iov_len),'L' ,0x8 ); + } + } } }
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec